From 86c935dea7d12e6882ecba2c6d27e6dc56c2aeae Mon Sep 17 00:00:00 2001
From: Timothy Miller <tim.miller@preparesoftware.com>
Date: Sun, 28 Feb 2021 12:06:38 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20CI=20Multi-Arch=20Docker=20Build?=
 =?UTF-8?q?s=20=F0=9F=97=84=EF=B8=8F=20Organized=20scripts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/image.yml                   | 23 +++++++++++++++++++
 .../docker-build-all.sh                       |  2 +-
 docker-build.sh => scripts/docker-build.sh    |  2 +-
 .../docker-publish.sh                         |  2 +-
 docker-run.sh => scripts/docker-run.sh        |  0
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/image.yml
 rename docker-build-all.sh => scripts/docker-build-all.sh (80%)
 rename docker-build.sh => scripts/docker-build.sh (79%)
 rename docker-publish.sh => scripts/docker-publish.sh (74%)
 rename docker-run.sh => scripts/docker-run.sh (100%)

diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
new file mode 100644
index 0000000..7b47e1b
--- /dev/null
+++ b/.github/workflows/image.yml
@@ -0,0 +1,23 @@
+name: build our image
+
+on:
+  push:
+    branches: master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout code
+        uses: actions/checkout@v2
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: build the image
+      run: |
+        docker buildx build \
+          --tag timothyjmiller/cloudflare-ddns:latest \
+          --platform linux/ppc64le,linux/s390x,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 .
\ No newline at end of file
diff --git a/docker-build-all.sh b/scripts/docker-build-all.sh
similarity index 80%
rename from docker-build-all.sh
rename to scripts/docker-build-all.sh
index 1c29860..cdc52ba 100755
--- a/docker-build-all.sh
+++ b/scripts/docker-build-all.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-docker buildx build --platform  linux/ppc64le,linux/s390x,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest .
+docker buildx build --platform  linux/ppc64le,linux/s390x,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest ../
 # TODO: Support linux/riscv64
diff --git a/docker-build.sh b/scripts/docker-build.sh
similarity index 79%
rename from docker-build.sh
rename to scripts/docker-build.sh
index 73e1594..b0547fe 100755
--- a/docker-build.sh
+++ b/scripts/docker-build.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker build --platform linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest .
+docker build --platform linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest ../
diff --git a/docker-publish.sh b/scripts/docker-publish.sh
similarity index 74%
rename from docker-publish.sh
rename to scripts/docker-publish.sh
index fe243ad..b54aa78 100755
--- a/docker-publish.sh
+++ b/scripts/docker-publish.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker buildx build --platform linux/ppc64le,linux/s390x,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest --push .
+docker buildx build --platform linux/ppc64le,linux/s390x,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest --push ../
diff --git a/docker-run.sh b/scripts/docker-run.sh
similarity index 100%
rename from docker-run.sh
rename to scripts/docker-run.sh