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] 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/