ci: reorder jobs, use builtin metadata method from build-push-action

pythoninthegrass · Oct 10, 2024 · 4b621a0 · 4b621a0
1 parent a48a432
commit 4b621a0
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -76,12 +76,6 @@ jobs:
           flavor: |
             latest=false
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Extract description from Dockerfile
         id: dockerfile_description
         run: |
@@ -92,6 +86,12 @@ jobs:
           fi
           echo "DESCRIPTION=$DESCRIPTION" >> $GITHUB_OUTPUT
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
@@ -103,5 +103,6 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           cache-from: type=registry,ref=${{ steps.meta.outputs.tags }}
           cache-to: type=registry,ref=${{ steps.meta.outputs.tags }},mode=max
-          annotations: |
-            org.opencontainers.image.description=${{ steps.dockerfile_description.outputs.DESCRIPTION }}
+          outputs: |
+            type=image,name=${{ steps.meta.outputs.tags }},annotation-index.org.opencontainers.image.description=${{ steps.dockerfile_description.outputs.DESCRIPTION }}
+