From 65211c0c7a08cc8532c525c731370a15b827ec28 Mon Sep 17 00:00:00 2001
From: sethforprivacy <seth@sethforprivacy.com>
Date: Wed, 10 Aug 2022 13:47:09 -0400
Subject: [PATCH] Enable multi-arch builds

---
 .github/workflows/update-base-image.yml    | 21 ++++++++++++-----
 .github/workflows/update-image-on-push.yml | 26 ++++++++++++++++------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/update-base-image.yml b/.github/workflows/update-base-image.yml
index 20b940d..5ca8fef 100644
--- a/.github/workflows/update-base-image.yml
+++ b/.github/workflows/update-base-image.yml
@@ -3,12 +3,23 @@ on:
   schedule:
     - cron: "0 12 * * 1" # Run every Monday at noon.
   workflow_dispatch:
+
 jobs:
   rebuild-container:
     name: "Rebuild Container with the latest base image"
     runs-on: ubuntu-latest
     steps:
-      -
+      - 
+        name: Prepare outputs
+        id: prep
+        run: |
+          echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+      - 
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.0.0
+        with:
+          platforms: linux/arm64
+      - 
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.0.0
       -
@@ -30,12 +41,13 @@ jobs:
         name: "Get p2pool Release Tag"
         id: get_tag
         run: echo "::set-output name=tag::$(awk -F "=" '/P2POOL_BRANCH=/ {print $2}' Dockerfile)"
-      -
-        name: Build and push to Docker Hub and Github Packages Docker Registry
+      - 
+        name: Build and push to Docker Hub and GitHub Packages Docker Registry
         id: docker_build
         uses: docker/build-push-action@v3.1.1
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository_owner }}/p2pool:latest
             ghcr.io/${{ github.repository_owner }}/p2pool:${{ steps.get_tag.outputs.tag }}
@@ -45,6 +57,3 @@ jobs:
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
             org.opencontainers.image.revision=${{ github.sha }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
diff --git a/.github/workflows/update-image-on-push.yml b/.github/workflows/update-image-on-push.yml
index 70df32a..85fc534 100644
--- a/.github/workflows/update-image-on-push.yml
+++ b/.github/workflows/update-image-on-push.yml
@@ -2,6 +2,8 @@ name: "Update image and push to Github Packages and Docker Hub when Dockerfile i
 # Run this workflow every time a new commit pushed to your repository
 on:
   push:
+    branches:
+    - main
     paths:
     - 'Dockerfile'
 jobs:
@@ -9,7 +11,17 @@ jobs:
     name: "Rebuild Container with the latest base image"
     runs-on: ubuntu-latest
     steps:
-      -
+      - 
+        name: Prepare outputs
+        id: prep
+        run: |
+          echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+      - 
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.0.0
+        with:
+          platforms: linux/arm64
+      - 
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.0.0
       -
@@ -31,12 +43,13 @@ jobs:
         name: "Get p2pool Release Tag"
         id: get_tag
         run: echo "::set-output name=tag::$(awk -F "=" '/P2POOL_BRANCH=/ {print $2}' Dockerfile)"
-      -
-        name: Build and push to Docker Hub and Github Packages Docker Registry
-        id: docker_build
+      - 
+        name: Build and push to Docker Hub and GitHub Packages Docker Registry
         uses: docker/build-push-action@v3.1.1
+        id: docker_build_push
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: |
             ghcr.io/${{ github.repository_owner }}/p2pool:latest
             ghcr.io/${{ github.repository_owner }}/p2pool:${{ steps.get_tag.outputs.tag }}
@@ -46,6 +59,5 @@ jobs:
             org.opencontainers.image.source=${{ github.event.repository.html_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
             org.opencontainers.image.revision=${{ github.sha }}
-      -
-        name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
\ No newline at end of file
+          cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/simple-monerod:latest
+          cache-to: type=inline