Merge pull request #488 from DFE-Digital/ops/github-workflow

Adjusted docker image tag to match release tag
DFE-Digital · Jan 12, 2023 · a5adf16 · a5adf16
2 parents 07e7803 + f95b2ad
commit a5adf16
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/build-and-push-image-development.yml b/.github/workflows/build-and-push-image-development.yml
@@ -26,11 +26,8 @@ jobs:
         run: |
           DOCKER_IMAGE=${{ secrets.DEVELOPMENT_AZURE_ACR_URL }}/acatran-app
           VERSION=dev-`date +%Y-%m-%d`.${{ github.run_number }}
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
-          if [ "${{ github.event_name }}" = "push" ]; then
-            VERSION=sha-${GITHUB_SHA}
-            TAGS="$TAGS,${DOCKER_IMAGE}:${VERSION}"
-          fi
+          SHA=sha-${GITHUB_SHA}
+          TAGS="${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${SHA}"
           echo "tags=${TAGS}" >> $GITHUB_OUTPUT
           echo "deploy-version=${VERSION}" >> $GITHUB_OUTPUT