From ca5757fa4d26c0f89f235f53e2ec7068eecbf31d Mon Sep 17 00:00:00 2001
From: Brenden Matthews <github@brenden.brndn.io>
Date: Thu, 2 May 2024 14:54:11 -0400
Subject: [PATCH] Move docker build to separate script for less jank

---
 .github/scripts/docker-build.bash | 45 +++++++++++++++++++++++++++++++
 .github/workflows/docker.yaml     | 42 ++---------------------------
 2 files changed, 47 insertions(+), 40 deletions(-)
 create mode 100755 .github/scripts/docker-build.bash

diff --git a/.github/scripts/docker-build.bash b/.github/scripts/docker-build.bash
new file mode 100755
index 000000000..0073c0191
--- /dev/null
+++ b/.github/scripts/docker-build.bash
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -ex
+
+DOCKERHUB_IMAGE_ID=$DOCKERHUB_ACCOUNT/$IMAGE_NAME
+
+# Change all uppercase to lowercase
+DOCKERHUB_IMAGE_ID=$(echo $DOCKERHUB_IMAGE_ID | tr '[A-Z]' '[a-z]')
+
+image_tags=()
+
+# Strip git ref prefix from version
+VERSION_TAG=$(echo $GITHUB_REF | sed -e 's,.*/\(.*\),\1,')
+
+# Strip "v" prefix from tag name
+if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+    VERSION_TAG=$(echo $VERSION_TAG | sed -e 's/^v//')
+fi
+
+image_tags+=("--tag" "$DOCKERHUB_IMAGE_ID:$VERSION_TAG")
+
+# tag as latest on releases
+if [[ "$RELEASE" == ON ]]; then
+    image_tags+=("--tag" "$DOCKERHUB_IMAGE_ID:latest")
+fi
+
+# Only build amd64 on PRs, build all platforms on main. The arm builds
+# take far too long.
+image_platforms="--platform linux/amd64"
+push_image=""
+cache_tag="pr-cache"
+
+# Only push on main
+if [[ "$GITHUB_REF" == refs/head/main ]]; then
+    push_image="--push"
+    image_platforms="--platform linux/arm/v7,linux/arm64/v8,linux/amd64"
+    cache_tag="main-cache"
+fi
+
+docker buildx build \
+    ${push_image} \
+    ${image_platforms} \
+    --cache-from=type=registry,ref=$DOCKERHUB_ACCOUNT/$IMAGE_NAME:$cache_tag \
+    --cache-to=type=registry,ref=$DOCKERHUB_ACCOUNT/$IMAGE_NAME:$cache_tag,mode=max \
+    "${image_tags[@]}" \
+    .
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index fc661fb17..3c4945bfe 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -44,43 +44,5 @@ jobs:
       - name: Build and push Docker image
         env:
           RELEASE: "${{ startsWith(github.ref, 'refs/tags/') && 'ON' || 'OFF' }}"
-        run: |
-          set -ex
-
-          DOCKERHUB_IMAGE_ID=$DOCKERHUB_ACCOUNT/$IMAGE_NAME
-
-          # Change all uppercase to lowercase
-          DOCKERHUB_IMAGE_ID=$(echo $DOCKERHUB_IMAGE_ID | tr '[A-Z]' '[a-z]')
-
-          image_tags=()
-
-          # Strip git ref prefix from version
-          VERSION_TAG=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == refs/tags/* ]] && VERSION_TAG=$(echo $VERSION_TAG | sed -e 's/^v//')
-
-          image_tags+=("--tag" "$DOCKERHUB_IMAGE_ID:$VERSION_TAG")
-
-          # tag as latest on releases
-          [[ "$RELEASE" == ON ]] && image_tags+=("--tag" "$DOCKERHUB_IMAGE_ID:latest")
-
-          # Only build amd64 on PRs, build all platforms on main. The arm builds
-          # take far too long.
-          image_platforms="--platform linux/amd64"
-          push_image=""
-          cache_tag="pr-cache"
-
-          # Only push on main
-          [[ "${{ github.ref }}" == refs/head/main ]] \
-            && push_image="--push" \
-            && image_platforms="--platform linux/arm/v7,linux/arm64/v8,linux/amd64" \
-            && cache_tag="main-cache"
-
-          docker buildx build \
-            ${push_image} \
-            ${image_platforms} \
-            --cache-from=type=registry,ref=$DOCKERHUB_ACCOUNT/$IMAGE_NAME:$cache_tag \
-            --cache-to=type=registry,ref=$DOCKERHUB_ACCOUNT/$IMAGE_NAME:$cache_tag,mode=max \
-            "${image_tags[@]}" \
-            .
+          GITHUB_REF: ${{ github.ref }}
+        run: ./.github/scripts/docker-build.bash