From c0c3e14016f0c5d6f1c0bb607cffd6caab01067e Mon Sep 17 00:00:00 2001
From: Max Stanley <github@maxstanley.uk>
Date: Sat, 9 Dec 2023 12:27:47 +0000
Subject: [PATCH] Simplify docker CI workflow

---
 .github/workflows/docker.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 72e00490..88715b1e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,18 +13,11 @@ jobs:
     docker:
         runs-on: ubuntu-latest
         steps:
+            # https://docs.docker.com/build/ci/github-actions/multi-platform/
             - uses: actions/checkout@v4
             - uses: docker/setup-qemu-action@v3
             - uses: docker/setup-buildx-action@v3
-            - name: Login to GitHub Container Registry
-              if: github.event_name != 'pull_request'
-              uses: docker/login-action@v3
-              with:
-                  registry: ghcr.io
-                  username: ${{ github.repository_owner }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
             - uses: docker/metadata-action@v5
-              if: github.ref_type == 'tag'
               id: meta
               with:
                   images: ghcr.io/${{ github.repository }}
@@ -39,18 +32,18 @@ jobs:
                       type=semver,pattern={{major}}
                       type=semver,pattern={{major}}.{{minor}}
                       type=semver,pattern={{version}}
-            - uses: docker/build-push-action@v5
+            - name: Login to GitHub Container Registry
               if: github.ref_type == 'tag'
+              uses: docker/login-action@v3
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.repository_owner }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+            - uses: docker/build-push-action@v5
               with:
                   context: .
-                  push: true
+                  push: ${{ github.ref_type == 'tag' }}
                   pull: true
                   tags: ${{ steps.meta.outputs.tags }}
                   labels: ${{ steps.meta.outputs.labels }}
                   platforms: linux/amd64,linux/arm64
-            - uses: docker/build-push-action@v5
-              if: github.ref_type == 'branch'
-              with:
-                  context: .
-                  push: false
-                  pull: true