From 5d169261d9bfefa63ca9275c21a9b6e2aeb47215 Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Thu, 8 Feb 2024 12:29:08 +0000
Subject: [PATCH 1/3] - Build multi-arch docker image using GitHub Actions

---
 .github/workflows/debug.yml                   | 22 --------------
 .../workflows/{docker.yml => docker-edge.yml} |  0
 .github/workflows/docker-latest.yml           | 30 +++++++++++++++++++
 3 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 .github/workflows/debug.yml
 rename .github/workflows/{docker.yml => docker-edge.yml} (100%)
 create mode 100644 .github/workflows/docker-latest.yml

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
deleted file mode 100644
index 6d010359..00000000
--- a/.github/workflows/debug.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Debug
-on:
-  push:
-    branches: [debug]
-
-jobs:
-  test:
-    runs-on: macos-latest
-    name: Run something on mac
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Print uname
-      run: uname -a
-
-    - name: Update bash
-      run: brew install bash
-
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker-edge.yml
similarity index 100%
rename from .github/workflows/docker.yml
rename to .github/workflows/docker-edge.yml
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
new file mode 100644
index 00000000..9f8e7315
--- /dev/null
+++ b/.github/workflows/docker-latest.yml
@@ -0,0 +1,30 @@
+name: Docker build (version + latest)
+on:
+  push: { tags: 'v*' }
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Extract tag
+        run: echo "TAG=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags:
+            - dannyben/bashly
+            - dannyben/bashly:${{ env.TAG }}

From 8420e562c35e97af385305bf593d285f7ac635cf Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Thu, 8 Feb 2024 12:33:08 +0000
Subject: [PATCH 2/3] tighten github action tag trigger to match only version
 tags

---
 .github/workflows/docker-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
index 9f8e7315..9e426271 100644
--- a/.github/workflows/docker-latest.yml
+++ b/.github/workflows/docker-latest.yml
@@ -1,6 +1,6 @@
 name: Docker build (version + latest)
 on:
-  push: { tags: 'v*' }
+  push: { tags: 'v[0-9]+.[0-9]+.[0-9]+' }
 
 jobs:
   docker:

From 999e819d52f3e797d2962cba7a6a39d2c84ec9b5 Mon Sep 17 00:00:00 2001
From: Danny Ben Shitrit <db@dannyben.com>
Date: Thu, 8 Feb 2024 12:37:51 +0000
Subject: [PATCH 3/3] fix docker tagging

---
 .github/workflows/docker-latest.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
index 9e426271..fb0c823d 100644
--- a/.github/workflows/docker-latest.yml
+++ b/.github/workflows/docker-latest.yml
@@ -25,6 +25,4 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags:
-            - dannyben/bashly
-            - dannyben/bashly:${{ env.TAG }}
+          tags: dannyben/bashly,dannyben/bashly:${{ env.TAG }}