Do the things in the build

Flagsmith · Nov 29, 2023 · 2d16bd2 · 2d16bd2
1 parent f5049c2
commit 2d16bd2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/platform-docker-publish-all-features-image.yml b/.github/workflows/platform-docker-publish-all-features-image.yml
@@ -98,11 +98,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Git credentials
-        run: |
-          echo "https://${{ secrets.GH_PRIVATE_ACCESS_TOKEN }}:@github.com" > $HOME/.git-credentials 
-          git config --global credential.helper store
-
       - name: Build and push images
         id: docker_build
         uses: docker/build-push-action@v3
@@ -115,3 +110,4 @@ jobs:
           build-args: |
             SAML_INSTALLED=1
             POETRY_OPTS=--with saml,auth-controller,ldap
+            GH_TOKEN=${{ secrets.GH_PRIVATE_ACCESS_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
@@ -28,6 +28,11 @@ ARG POETRY_VIRTUALENVS_CREATE=false
 RUN make install-poetry
 ENV PATH="$PATH:/root/.local/bin"
 
+ARG GH_TOKEN
+RUN if [ -n "${GH_TOKEN}" ]; \
+  then echo "https://${GH_TOKEN}:@github.com" > ${HOME}/.git-credentials \
+  && git config --global credential.helper store; fi;
+
 ARG POETRY_OPTS
 RUN make install-packages opts="${POETRY_OPTS}"
 

diff --git a/api/Dockerfile b/api/Dockerfile
@@ -9,6 +9,11 @@ ARG POETRY_VIRTUALENVS_CREATE=false
 RUN make install-poetry
 ENV PATH="$PATH:/root/.local/bin"
 
+ARG GH_TOKEN
+RUN if [ -n "${GH_TOKEN}" ]; \
+  then echo "https://${GH_TOKEN}:@github.com" > ${HOME}/.git-credentials \
+  && git config --global credential.helper store; fi;
+
 ARG POETRY_OPTS
 RUN make install-packages opts="${POETRY_OPTS}"