From 4b621a07e6a681f86c4746b8563d8d657a0f2468 Mon Sep 17 00:00:00 2001 From: pythoninthegrass <4097471+pythoninthegrass@users.noreply.github.com> Date: Thu, 10 Oct 2024 01:27:41 -0500 Subject: [PATCH] ci: reorder jobs, use builtin metadata method from build-push-action --- .github/workflows/docker.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 307e855b7..54b190cbc 100644 --- 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 }} +