refactor: cleanup release pipeline

segadora · Nov 2, 2024 · d7065a1 · d7065a1
1 parent 6c6981a
commit d7065a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,6 +40,8 @@ jobs:
       id-token: write
       packages: write
       attestations: write
+    outputs:
+      tag: ${{ needs.release-please.outputs.tag }}
     steps:
       - name: Prepare
         run: |
@@ -52,9 +54,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=latest
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
+            value=latest
+            type=semver,pattern={{version}},value=${{ needs.release-please.outputs.tag }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ needs.release-please.outputs.tag }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -73,9 +75,12 @@ jobs:
         id: build
         uses: docker/build-push-action@v6
         with:
+          provenance: false
+          push: true
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
+          tags: ${{ steps.meta.outputs.tags }}
+          #outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
@@ -118,6 +123,10 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            value=latest
+            type=semver,pattern={{version}},value=${{ needs.build.outputs.tag }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ needs.build.outputs.tag }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -134,4 +143,4 @@ jobs:
 
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}  
+          docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }}