From f18f4c69f26a8606e6f95754ebebdc762242a88d Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Thu, 23 Jul 2020 13:53:53 +0100
Subject: [PATCH 1/6] Adds Docker multi-arch build support

---
 .github/workflows/dockerhub.yml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index f1c0025d..7b44f938 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -8,9 +8,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: trigger
-      run: curl -X POST https://hub.docker.com/api/build/v1/source/1813a660-2ee5-4583-a238-dd54e9a6ebac/trigger/c8cd9f1f-f269-45bc-9750-a08327257f62/call/
-    
-    
-
-
+      - name: checkout code
+        uses: actions/checkout@v2
+      - name: install buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v1
+        with:
+          version: latest
+      - name: login to docker hub
+        run: |
+          echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+      - name: build the image
+        run: |
+          docker buildx build \
+            --push \
+            --tag neilpang/acme.sh:latest \
+            --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .

From 67360e93b8564228035b4a7604d3c70e887ff6e7 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 24 Jul 2020 09:25:58 +0100
Subject: [PATCH 2/6] Correctly labels Docker images per branch

---
 .github/workflows/dockerhub.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 7b44f938..8c277827 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -18,9 +18,17 @@ jobs:
       - name: login to docker hub
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-      - name: build the image
+      - name: build and push the image (master branch)
         run: |
           docker buildx build \
             --push \
             --tag neilpang/acme.sh:latest \
             --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .
+        if: ${{ github.ref == 'refs/heads/master' }}
+      - name: build and push the image (dev branch)
+        run: |
+          docker buildx build \
+            --push \
+            --tag neilpang/acme.sh:dev \
+            --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .
+        if: ${{ github.ref == 'refs/heads/dev' }}

From 6fbf33c8f4f9a643f83caf279ff8ca292598f4d7 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 21 Aug 2020 09:54:24 +0100
Subject: [PATCH 3/6] More changes

---
 .github/workflows/dockerhub.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 8c277827..fc1db8e5 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -2,7 +2,12 @@
 name: Build DockerHub
 on:
   push:
-    branches: [ master, dev ]
+    branches:
+      - master
+      - dev
+      - temp
+    tags:
+      - '*'
     
 jobs:
   build:
@@ -12,23 +17,21 @@ jobs:
         uses: actions/checkout@v2
       - name: install buildx
         id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
+        uses: crazy-max/ghaction-docker-buildx@v3
         with:
-          version: latest
+          buildx-version: latest
+          qemu-version: latest
       - name: login to docker hub
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-      - name: build and push the image (master branch)
+      - name: build and push the image
         run: |
+          DOCKER_IMAGE_TAG=$(echo ${GITHUB_REF#refs/heads/} | sed 's/^master$/latest/')
+          [ "$DOCKER_IMAGE" == "latest" ] && AUTO_UPGRADE="1" || AUTO_UPGRADE=""
+
           docker buildx build \
-            --push \
-            --tag neilpang/acme.sh:latest \
+            --output "type=image,push=true" \
+            --tag ei99070/acme.sh:${DOCKER_IMAGE_TAG} \
+            --tag ei99070/acme.sh:${GITHUB_SHA} \
+            --build-arg AUTO_UPGRADE=${AUTO_UPGRADE} \
             --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .
-        if: ${{ github.ref == 'refs/heads/master' }}
-      - name: build and push the image (dev branch)
-        run: |
-          docker buildx build \
-            --push \
-            --tag neilpang/acme.sh:dev \
-            --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .
-        if: ${{ github.ref == 'refs/heads/dev' }}

From abc62b9348d6d01a0da8c17b6d6afe9e42ec84df Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 21 Aug 2020 10:34:43 +0100
Subject: [PATCH 4/6] more

---
 .github/workflows/dockerhub.yml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index fc1db8e5..4a5efc38 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -26,12 +26,25 @@ jobs:
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: build and push the image
         run: |
-          DOCKER_IMAGE_TAG=$(echo ${GITHUB_REF#refs/heads/} | sed 's/^master$/latest/')
-          [ "$DOCKER_IMAGE" == "latest" ] && AUTO_UPGRADE="1" || AUTO_UPGRADE=""
+          DOCKER_IMAGE=ei99070/acme.sh
+
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            BRANCH_TAG=${GITHUB_REF#refs/tags/}
+            AUTO_UPGRADE=1
+          fi
+
+          if [[ $GITHUB_REF == refs/heads/* ]]; then
+            BRANCH_TAG=${GITHUB_REF#refs/heads/}
+
+            if [[ $BRANCH_TAG == master ]]; then
+              BRANCH_TAG=latest
+              AUTO_UPGRADE=1
+            fi
+          fi
 
           docker buildx build \
+            --tag ${DOCKER_IMAGE}:${BRANCH_TAG} \
+            --tag ${DOCKER_IMAGE}:${GITHUB_SHA} \
             --output "type=image,push=true" \
-            --tag ei99070/acme.sh:${DOCKER_IMAGE_TAG} \
-            --tag ei99070/acme.sh:${GITHUB_SHA} \
             --build-arg AUTO_UPGRADE=${AUTO_UPGRADE} \
             --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .

From fcb6198a823da64f1e02815f4d994d05bceb9fa0 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 21 Aug 2020 10:55:07 +0100
Subject: [PATCH 5/6] More updated following PR comments

---
 .github/workflows/dockerhub.yml | 15 ++++++---------
 Dockerfile                      |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index bd96a8de..cf65f4a6 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -3,8 +3,7 @@ name: Build DockerHub
 on:
   push:
     branches:
-      - master
-      - dev
+      - '*'
     tags:
       - '*'
     
@@ -28,22 +27,20 @@ jobs:
           DOCKER_IMAGE=neilpang/acme.sh
 
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            BRANCH_TAG=${GITHUB_REF#refs/tags/}
-            AUTO_UPGRADE=1
+            DOCKER_IMAGE_TAG=${GITHUB_REF#refs/tags/}
           fi
 
           if [[ $GITHUB_REF == refs/heads/* ]]; then
-            BRANCH_TAG=${GITHUB_REF#refs/heads/}
+            DOCKER_IMAGE_TAG=${GITHUB_REF#refs/heads/}
 
-            if [[ $BRANCH_TAG == master ]]; then
-              BRANCH_TAG=latest
+            if [[ $DOCKER_IMAGE_TAG == master ]]; then
+              DOCKER_IMAGE_TAG=latest
               AUTO_UPGRADE=1
             fi
           fi
 
           docker buildx build \
-            --tag ${DOCKER_IMAGE}:${BRANCH_TAG} \
-            --tag ${DOCKER_IMAGE}:${GITHUB_SHA} \
+            --tag ${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG} \
             --output "type=image,push=true" \
             --build-arg AUTO_UPGRADE=${AUTO_UPGRADE} \
             --platform linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386 .
diff --git a/Dockerfile b/Dockerfile
index f00d03bd..a61c6ab4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN apk update -f \
 
 ENV LE_CONFIG_HOME /acme.sh
 
-ENV AUTO_UPGRADE 1
+ARG AUTO_UPGRADE=1
 
 #Install
 ADD ./ /install_acme.sh/

From 05477c1a0312215615241871c42b4376f9565027 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 21 Aug 2020 11:03:53 +0100
Subject: [PATCH 6/6] Fixes Dockerfile

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index a61c6ab4..4cea3c06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,8 @@ ENV LE_CONFIG_HOME /acme.sh
 
 ARG AUTO_UPGRADE=1
 
+ENV AUTO_UPGRADE $AUTO_UPGRADE
+
 #Install
 ADD ./ /install_acme.sh/
 RUN cd /install_acme.sh && ([ -f /install_acme.sh/acme.sh ] && /install_acme.sh/acme.sh --install || curl https://get.acme.sh | sh) && rm -rf /install_acme.sh/