Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
or this
Browse files Browse the repository at this point in the history
doshitan committed Dec 31, 2024
1 parent cb13c3a commit 34c75c7
Showing 3 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-docker.yml
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/configure-git

- name: Build
run: make build
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -9,8 +9,6 @@ RUN apt-get update \
&& apt-get install --no-install-recommends --yes \
git
RUN git config --global --add safe.directory "*"
RUN git config --global user.name "nava-platform"
RUN git config --global user.email "platform-admins@navapbc.com"

ENV POETRY_NO_INTERACTION=true \
POETRY_VIRTUALENVS_IN_PROJECT=true \
12 changes: 6 additions & 6 deletions bin/docker-wrapper
Original file line number Diff line number Diff line change
@@ -35,12 +35,12 @@ esac
# permission issues with mounted locations from the host file system
docker_flags+=(--user "$(id -u):$(id -g)")

# # connect the host git config if present, for better chance committing with work
# # inside the container (theoretically someone may not have their name/email
# # configured even if the config file exists)
# if [[ -e "$HOME/.gitconfig" ]]; then
# docker_flags+=("-v=$HOME/.gitconfig:/.gitconfig")
# fi
# connect the host git config if present, for better chance committing with work
# inside the container (theoretically someone may not have their name/email
# configured even if the config file exists)
if [[ -e "$HOME/.gitconfig" ]]; then
docker_flags+=("-v=$HOME/.gitconfig:/.gitconfig")
fi

# figure out what location to mount for logs
HOST_LOG_DIR=${HOST_LOG_DIR:-}

0 comments on commit 34c75c7

Please sign in to comment.