Release major version of container (#4296)

sitespeedio · Oct 13, 2024 · bbad6a0 · bbad6a0
1 parent 952887a
commit bbad6a0
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/.github/workflows/building-docker-release.yml b/.github/workflows/building-docker-release.yml
@@ -22,13 +22,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Get the tag
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-        with:
-          strip_v: true
-      - name: Extract version (alternative version)
+      - name: Extract version
         id: extract_version
         run: |
             VERSION_TAG=${GITHUB_REF#refs/tags/}
@@ -42,13 +36,6 @@ jobs:
 
             echo "SITESPEED_VERSION=$VERSION" >> $GITHUB_OUTPUT
             echo "SITESPEED_MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_OUTPUT
-      - name: Test versions  
-        run: |
-          echo "Using SITESPEED_VERSION: ${SITESPEED_VERSION}"
-          echo "Using SITESPEED_MAJOR_VERSION: ${SITESPEED_MAJOR_VERSION}"
-        env:
-          SITESPEED_VERSION: ${{ steps.extract_version.outputs.SITESPEED_VERSION }}
-          SITESPEED_MAJOR_VERSION: ${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}    
       -
         name: Build and push sitespeed.io
         uses: docker/build-push-action@v5
@@ -57,26 +44,35 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           provenance: false
-          tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}},sitespeedio/sitespeed.io:latest
+          tags: sitespeedio/sitespeed.io:${SITESPEED_VERSION},sitespeedio/sitespeed.io:${SITESPEED_MAJOR_VERSION},sitespeedio/sitespeed.io:latest
+        env:
+          SITESPEED_VERSION: ${{ steps.extract_version.outputs.SITESPEED_VERSION }}
+          SITESPEED_MAJOR_VERSION: ${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}
       -
         name: Build and push sitespeed.io+1
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           file: ./docker/Dockerfile-plus1
-          build-args: version=${{steps.tag.outputs.tag}} 
+          build-args: version=${SITESPEED_VERSION}
           push: true
           provenance: false
-          tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}}-plus1
+          tags: sitespeedio/sitespeed.io:${SITESPEED_VERSION}-plus1,sitespeedio/sitespeed.io:${SITESPEED_MAJOR_VERSION}-plus1
+        env:
+          SITESPEED_VERSION: ${{ steps.extract_version.outputs.SITESPEED_VERSION }}
+          SITESPEED_MAJOR_VERSION: ${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}
       -
         name: Build and push sitespeed.io-slim
         uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           file: ./Dockerfile-slim
-          build-args: version=${{steps.tag.outputs.tag}} 
+          build-args: version=${SITESPEED_VERSION}
           push: true
           provenance: false
-          tags: sitespeedio/sitespeed.io:${{steps.tag.outputs.tag}}-slim
+          tags: sitespeedio/sitespeed.io:${SITESPEED_VERSION}-slim,sitespeedio/sitespeed.io:${SITESPEED_MAJOR_VERSION}-slim
+        env:
+          SITESPEED_VERSION: ${{ steps.extract_version.outputs.SITESPEED_VERSION }}
+          SITESPEED_MAJOR_VERSION: ${{ steps.extract_version.outputs.SITESPEED_MAJOR_VERSION }}