Merge pull request #4633 from HSLdevcom/v3-prod-pipeline

Release workflow for v3
HSLdevcom · Sep 15, 2022 · 05d2db6 · 05d2db6
2 parents 7bc471a + 52fd1a2
commit 05d2db6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/prod-pipeline.yml b/.github/workflows/prod-pipeline.yml
@@ -15,9 +15,11 @@ jobs:
           if [[ ${GITHUB_REF##*/} =~ ^202[0-9][0-1][0-9][0-3][0-9] ]]; then
               echo ::set-output name=match::true
           fi
-      - name: Push latest image as prod
+      - name: Push latest image as v3-prod
         if: steps.check-tag.outputs.match == 'true'
         run: ./.github/workflows/scripts/push_prod.sh
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }}
+          DOCKER_BASE_TAG: v3-prod
+          DOCKER_DEV_TAG: v3
diff --git a/.github/workflows/v3-dev-pipeline.yml b/.github/workflows/v3-dev-pipeline.yml
@@ -169,14 +169,14 @@ jobs:
       - name: Create Docker image tag
         id: docker-tags
         run: |
-          echo "::set-output name=permanent-tag::v3-dev-$(date +"%Y-%m-%dT%H.%M.%S")-${GITHUB_SHA:0:7}"
+          echo "::set-output name=permanent-tag::v3-$(date +"%Y-%m-%dT%H.%M.%S")-${GITHUB_SHA:0:7}"
 
       - name: build and push Docker image
         uses: docker/build-push-action@v2
         with:
           context: .
           tags: |
-            hsldevcom/digitransit-ui:v3-dev
+            hsldevcom/digitransit-ui:v3
             hsldevcom/digitransit-ui:${{ steps.docker-tags.outputs.permanent-tag }}
           # https://github.com/docker/build-push-action/blob/9472e9021074a3cb3279ba431598b8836d40433f/docs/advanced/cache.md#github-cache
           # https://github.com/moby/buildkit#registry-push-image-and-cache-separately