From 593036c8ad8099a3a4e7b1ac9b1dcfbdb8e04a98 Mon Sep 17 00:00:00 2001
From: josh <josh@joshjacobs.net>
Date: Sat, 23 Sep 2023 21:27:41 +0000
Subject: [PATCH] fix: correct multiplatform builds because apparently
 manifests are too difficult

---
 .github/workflows/docker-build.yml            | 45 ++++++++++++++++++-
 ...-compose.yml => docker-compose.yml.example |  9 +---
 2 files changed, 46 insertions(+), 8 deletions(-)
 rename docker-compose.yml => docker-compose.yml.example (68%)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index f39dd2b..eeec20f 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -6,6 +6,9 @@ on:
     branches:
       - "main"
 
+env:
+  REGISTRY_IMAGE: registry.dangerous.tech/dangeroustech/zerotierbridge
+
 jobs:
   Docker_Release:
     name: "Docker Build And Release"
@@ -33,7 +36,7 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
-      - name: Build and Push
+      - name: Build
         id: docker_build
         uses: docker/build-push-action@v5
         with:
@@ -44,6 +47,46 @@ jobs:
           push: true
           platforms: linux/${{ matrix.arch }}
           tags: registry.dangerous.tech/dangeroustech/zerotierbridge:latest
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true
+
+      - name: Export Digests
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.docker_build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload digest
+        uses: actions/upload-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  MergeRefs:
+    name: "Do The Horrible Merge Thing"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
       - name: Generate SBOM
         uses: anchore/sbom-action@v0
diff --git a/docker-compose.yml b/docker-compose.yml.example
similarity index 68%
rename from docker-compose.yml
rename to docker-compose.yml.example
index 2130417..543f251 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml.example
@@ -3,12 +3,7 @@ version: "3"
 services:
   zerotierbridge:
     container_name: zerotierbridge
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        ARCH: amd64
-        VERSION: 1.12.2
+    image: registry.dangerous.tech/dangeroustech/zerotierbridge
     restart: always
     privileged: true
     volumes:
@@ -17,4 +12,4 @@ services:
       - ZT_NETWORKS=NETWORK_ID_1 NETWORK_ID_2 NETWORK_ID_3
       - ZT_BRIDGE=true
 volumes:
-  zt_config:
+  zt_config:
\ No newline at end of file