From 00466159d2f87cfe9e4c73b6a9f54f14fd67cbc3 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 20:53:27 -0700
Subject: [PATCH 01/33] Create main.yml

---
 .github/workflows/main.yml | 60 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..2fd13e9
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,60 @@
+name: php-apache-test
+
+on:
+  push:
+  schedule:
+    - cron: '0 */8 * * *'
+
+jobs:
+  php-apache-docker-image-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: docker login
+        run: docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
+      - name: treehouses php-apache
+        run: |
+          export DOCKER_CLI_EXPERIMENTAL=enabled
+          repo="jleekwong/php-apache"
+          base="php_apache"
+          source .github/workflows/utils.sh
+          php_apache_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
+          echo $php_apache_arm_sha
+          alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
+          echo $alpine_arm_sha
+          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "$repo@"$php_apache_arm_sha)
+          echo $flag_arm
+          php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
+          echo $php_apache_amd64_sha
+          alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
+          echo $alpine_amd64_sha
+          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "$repo@"$php_apache_amd64_sha)
+          echo $flag_amd64
+          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          echo $php_apache_arm64_sha
+          alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
+          echo $alpine_arm64_sha
+          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag_arm64
+          flag=$(compare "treehouses/alpine@"$alpine_arm_sha "$repo@"$php_apache_arm_sha "treehouses/alpine@"$alpine_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/alpine@"$alpine_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag
+          if [[ $flag == true ]]; then
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            build_image "treehouses/alpine:latest" arm "$repo" #base image is arm arch
+            build_image "treehouses/alpine:latest" amd64 "$repo" #base image is amd64 arch
+            build_image "treehouses/alpine:latest" arm64 "$repo" #base image is arm64 arch
+            deploy_image "$repo" arm
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
+            tag=$(date +%Y%m%d%H%M)
+            tag2="latest"
+            echo $tag
+            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            docker manifest inspect $repo:$tag
+            docker manifest inspect $repo:$tag2
+            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          else
+            echo "no changes"
+          fi

From 12cb3adaf345d93d14af7aef225944556da34777 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:00:59 -0700
Subject: [PATCH 02/33] Rename utils.sh to .github/workflows/utils.sh

---
 utils.sh => .github/workflows/utils.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename utils.sh => .github/workflows/utils.sh (100%)

diff --git a/utils.sh b/.github/workflows/utils.sh
similarity index 100%
rename from utils.sh
rename to .github/workflows/utils.sh

From b30c7053c03168cbab1bc8a1b1a03b8d4a95fcc8 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:12:11 -0700
Subject: [PATCH 03/33] Update main.yml

---
 .github/workflows/main.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2fd13e9..dc678a9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,29 +22,29 @@ jobs:
           source .github/workflows/utils.sh
           php_apache_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
           echo $php_apache_arm_sha
-          alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
-          echo $alpine_arm_sha
-          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "$repo@"$php_apache_arm_sha)
+          nginx_arm_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm")
+          echo $nginx_arm_sha
+          flag_arm=$(is_base "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha)
           echo $flag_arm
           php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           echo $php_apache_amd64_sha
-          alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
-          echo $alpine_amd64_sha
-          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "$repo@"$php_apache_amd64_sha)
+          nginx_amd64_sha=$(get_manifest_sha "treehouses/nginx:latest" "amd64")
+          echo $nginx_amd64_sha
+          flag_amd64=$(is_base "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha)
           echo $flag_amd64
           php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
           echo $php_apache_arm64_sha
-          alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
-          echo $alpine_arm64_sha
-          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "$repo@"$php_apache_arm64_sha)
+          nginx_arm64_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm64")
+          echo $nginx_arm64_sha
+          flag_arm64=$(is_base "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
           echo $flag_arm64
-          flag=$(compare "treehouses/alpine@"$alpine_arm_sha "$repo@"$php_apache_arm_sha "treehouses/alpine@"$alpine_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/alpine@"$alpine_arm64_sha "$repo@"$php_apache_arm64_sha)
+          flag=$(compare "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "treehouses/alpine:latest" arm "$repo" #base image is arm arch
-            build_image "treehouses/alpine:latest" amd64 "$repo" #base image is amd64 arch
-            build_image "treehouses/alpine:latest" arm64 "$repo" #base image is arm64 arch
+            build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
+            build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
+            build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
             deploy_image "$repo" arm
             deploy_image "$repo" amd64
             deploy_image "$repo" arm64

From f2a05cbe3ec8ecc94eb5531b66ef74730e2dfae2 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:15:54 -0700
Subject: [PATCH 04/33] Update main.yml

---
 .github/workflows/main.yml | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dc678a9..d66f976 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,33 +28,33 @@ jobs:
           echo $flag_arm
           php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           echo $php_apache_amd64_sha
-          nginx_amd64_sha=$(get_manifest_sha "treehouses/nginx:latest" "amd64")
-          echo $nginx_amd64_sha
-          flag_amd64=$(is_base "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha)
-          echo $flag_amd64
-          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
-          echo $php_apache_arm64_sha
-          nginx_arm64_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm64")
-          echo $nginx_arm64_sha
-          flag_arm64=$(is_base "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
-          echo $flag_arm64
-          flag=$(compare "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
-          echo $flag
-          if [[ $flag == true ]]; then
-            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
-            build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
-            build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
-            deploy_image "$repo" arm
-            deploy_image "$repo" amd64
-            deploy_image "$repo" arm64
-            tag=$(date +%Y%m%d%H%M)
-            tag2="latest"
-            echo $tag
-            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-            docker manifest inspect $repo:$tag
-            docker manifest inspect $repo:$tag2
-            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
-          else
-            echo "no changes"
-          fi
+          #nginx_amd64_sha=$(get_manifest_sha "treehouses/nginx:latest" "amd64")
+          #echo $nginx_amd64_sha
+          #flag_amd64=$(is_base "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha)
+          #echo $flag_amd64
+          #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          #echo $php_apache_arm64_sha
+          #nginx_arm64_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm64")
+          #echo $nginx_arm64_sha
+          #flag_arm64=$(is_base "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
+          #echo $flag_arm64
+          #flag=$(compare "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
+          #echo $flag
+          #if [[ $flag == true ]]; then
+            #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            #build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
+            #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
+            #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
+            #deploy_image "$repo" arm
+            #deploy_image "$repo" amd64
+            #deploy_image "$repo" arm64
+            #tag=$(date +%Y%m%d%H%M)
+            #tag2="latest"
+            #echo $tag
+            #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            #docker manifest inspect $repo:$tag
+            #docker manifest inspect $repo:$tag2
+            #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          #else
+            #echo "no changes"
+          #fi

From bb8fc60dd2cc91af7d43cda5c7931cf80e85a150 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:17:35 -0700
Subject: [PATCH 05/33] Update main.yml

---
 .github/workflows/main.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d66f976..8b91ab1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,20 +28,20 @@ jobs:
           echo $flag_arm
           php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           echo $php_apache_amd64_sha
-          #nginx_amd64_sha=$(get_manifest_sha "treehouses/nginx:latest" "amd64")
-          #echo $nginx_amd64_sha
-          #flag_amd64=$(is_base "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha)
-          #echo $flag_amd64
-          #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
-          #echo $php_apache_arm64_sha
-          #nginx_arm64_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm64")
-          #echo $nginx_arm64_sha
-          #flag_arm64=$(is_base "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
-          #echo $flag_arm64
-          #flag=$(compare "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
-          #echo $flag
-          #if [[ $flag == true ]]; then
-            #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          nginx_amd64_sha=$(get_manifest_sha "treehouses/nginx:latest" "amd64")
+          echo $nginx_amd64_sha
+          flag_amd64=$(is_base "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha)
+          echo $flag_amd64
+          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          echo $php_apache_arm64_sha
+          nginx_arm64_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm64")
+          echo $nginx_arm64_sha
+          flag_arm64=$(is_base "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag_arm64
+          flag=$(compare "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag
+          if [[ $flag == true ]]; then
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             #build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
             #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
             #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
@@ -57,4 +57,4 @@ jobs:
             #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
           #else
             #echo "no changes"
-          #fi
+          fi

From 85e92d0571e94028ea32782f366ffbc3cc5915c1 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:18:59 -0700
Subject: [PATCH 06/33] Update main.yml

---
 .github/workflows/main.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b91ab1..a8f0f0f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,14 +42,14 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            #build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
-            #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
-            #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
-            #deploy_image "$repo" arm
-            #deploy_image "$repo" amd64
-            #deploy_image "$repo" arm64
-            #tag=$(date +%Y%m%d%H%M)
-            #tag2="latest"
+            build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
+            build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
+            build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
+            deploy_image "$repo" arm
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
+            tag=$(date +%Y%m%d%H%M)
+            tag2="latest"
             #echo $tag
             #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
             #docker manifest inspect $repo:$tag

From a199a6faf10d2734f3d615ec68a676013a25c579 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:20:20 -0700
Subject: [PATCH 07/33] Update main.yml

---
 .github/workflows/main.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a8f0f0f..5b6021e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,10 +46,10 @@ jobs:
             build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
             build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
             deploy_image "$repo" arm
-            deploy_image "$repo" amd64
-            deploy_image "$repo" arm64
-            tag=$(date +%Y%m%d%H%M)
-            tag2="latest"
+            #deploy_image "$repo" amd64
+            #deploy_image "$repo" arm64
+            #tag=$(date +%Y%m%d%H%M)
+            #tag2="latest"
             #echo $tag
             #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
             #docker manifest inspect $repo:$tag

From 4c4135e351d5b1182a90e2872b416bf03399445d Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:24:44 -0700
Subject: [PATCH 08/33] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5b6021e..e301f07 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,8 +44,8 @@ jobs:
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
             build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
-            build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
-            deploy_image "$repo" arm
+            #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
+            #deploy_image "$repo" arm
             #deploy_image "$repo" amd64
             #deploy_image "$repo" arm64
             #tag=$(date +%Y%m%d%H%M)

From 7ad80c208b33860972ee7268dc80b73f0ed26b00 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:25:50 -0700
Subject: [PATCH 09/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e301f07..24ff193 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
-            build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
+            #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
             #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
             #deploy_image "$repo" arm
             #deploy_image "$repo" amd64

From 7d2957261ba318a6fa30d35bf957a6850cdef73a Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:27:03 -0700
Subject: [PATCH 10/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 24ff193..8b91ab1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
+            #build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
             #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
             #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
             #deploy_image "$repo" arm

From ae15b9da8e93ea0850e6ec7a6f5b66cf83c4dbda Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Wed, 28 Apr 2021 21:34:06 -0700
Subject: [PATCH 11/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8b91ab1..4eae103 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            #build_image "treehouses/nginx:latest" arm "$repo" #base image is arm arch
+            build_image "treehouses/apache:latest" arm "treehouses/php-apache"
             #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
             #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
             #deploy_image "$repo" arm

From 9306c9941afd95b38632033f2cb05b119df875bd Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Thu, 29 Apr 2021 23:01:59 -0700
Subject: [PATCH 12/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4eae103..2540711 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             build_image "treehouses/apache:latest" arm "treehouses/php-apache"
-            #build_image "treehouses/nginx:latest" amd64 "$repo" #base image is amd64 arch
+            build_image "treehouses/apache:latest" amd64 "treehouses/php-apache"
             #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
             #deploy_image "$repo" arm
             #deploy_image "$repo" amd64

From f1b05366327af01eed029c795316b686bc89974a Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Thu, 29 Apr 2021 23:16:54 -0700
Subject: [PATCH 13/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2540711..ef26bbe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,7 +44,7 @@ jobs:
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             build_image "treehouses/apache:latest" arm "treehouses/php-apache"
             build_image "treehouses/apache:latest" amd64 "treehouses/php-apache"
-            #build_image "treehouses/nginx:latest" arm64 "$repo" #base image is arm64 arch
+            build_image "treehouses/apache:latest" arm64 "treehouses/php-apache"
             #deploy_image "$repo" arm
             #deploy_image "$repo" amd64
             #deploy_image "$repo" arm64

From 4524e0d70793f63a9293fa5e2198d726307da8c8 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 00:35:03 -0700
Subject: [PATCH 14/33] Update main.yml

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ef26bbe..3c0a8a6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,11 +45,11 @@ jobs:
             build_image "treehouses/apache:latest" arm "treehouses/php-apache"
             build_image "treehouses/apache:latest" amd64 "treehouses/php-apache"
             build_image "treehouses/apache:latest" arm64 "treehouses/php-apache"
-            #deploy_image "$repo" arm
-            #deploy_image "$repo" amd64
-            #deploy_image "$repo" arm64
-            #tag=$(date +%Y%m%d%H%M)
-            #tag2="latest"
+            deploy_image "$repo" arm
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
+            tag=$(date +%Y%m%d%H%M)
+            tag2="latest"
             #echo $tag
             #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
             #docker manifest inspect $repo:$tag

From 485103b2763b7eb994f7a766afb39b4b9efc0029 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 00:46:25 -0700
Subject: [PATCH 15/33] Update main.yml

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c0a8a6..9fd923e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,9 +45,9 @@ jobs:
             build_image "treehouses/apache:latest" arm "treehouses/php-apache"
             build_image "treehouses/apache:latest" amd64 "treehouses/php-apache"
             build_image "treehouses/apache:latest" arm64 "treehouses/php-apache"
-            deploy_image "$repo" arm
-            deploy_image "$repo" amd64
-            deploy_image "$repo" arm64
+            deploy_image "treehouses/php-apache" arm
+            deploy_image "treehouses/php-apache" amd64
+            deploy_image "treehouses/php-apache" arm64
             tag=$(date +%Y%m%d%H%M)
             tag2="latest"
             #echo $tag

From 238983cda9577639629b0a9f36e80d0295fb0d39 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 00:57:02 -0700
Subject: [PATCH 16/33] Update main.yml

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9fd923e..3c0a8a6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,9 +45,9 @@ jobs:
             build_image "treehouses/apache:latest" arm "treehouses/php-apache"
             build_image "treehouses/apache:latest" amd64 "treehouses/php-apache"
             build_image "treehouses/apache:latest" arm64 "treehouses/php-apache"
-            deploy_image "treehouses/php-apache" arm
-            deploy_image "treehouses/php-apache" amd64
-            deploy_image "treehouses/php-apache" arm64
+            deploy_image "$repo" arm
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
             tag=$(date +%Y%m%d%H%M)
             tag2="latest"
             #echo $tag

From ed755b264778aebd91b0d4a8e850284bedd63a62 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:09:32 -0700
Subject: [PATCH 17/33] Update main.yml

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c0a8a6..87b03b3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,9 +42,9 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "treehouses/apache:latest" arm "treehouses/php-apache"
-            build_image "treehouses/apache:latest" amd64 "treehouses/php-apache"
-            build_image "treehouses/apache:latest" arm64 "treehouses/php-apache"
+            build_image "jleekwong/apache:latest" arm "treehouses/php-apache"
+            build_image "jleekwong/apache:latest" amd64 "treehouses/php-apache"
+            build_image "jleekwong/apache:latest" arm64 "treehouses/php-apache"
             deploy_image "$repo" arm
             deploy_image "$repo" amd64
             deploy_image "$repo" arm64

From 3b4d64ae0b47b594cc7103a32922d61e391e70ac Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:09:43 -0700
Subject: [PATCH 18/33] Update main.yml

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 87b03b3..8d234ce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,9 +42,9 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "jleekwong/apache:latest" arm "treehouses/php-apache"
-            build_image "jleekwong/apache:latest" amd64 "treehouses/php-apache"
-            build_image "jleekwong/apache:latest" arm64 "treehouses/php-apache"
+            build_image "jleekwong/apache:latest" arm "jleekwong/php-apache"
+            build_image "jleekwong/apache:latest" amd64 "jleekwong/php-apache"
+            build_image "jleekwong/apache:latest" arm64 "jleekwong/php-apache"
             deploy_image "$repo" arm
             deploy_image "$repo" amd64
             deploy_image "$repo" arm64

From 32f9641da19c5f6e6cce8dd850c724b89ccb4c72 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:17:05 -0700
Subject: [PATCH 19/33] Update main.yml

---
 .github/workflows/main.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8d234ce..0ac1a96 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,14 +42,14 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "jleekwong/apache:latest" arm "jleekwong/php-apache"
-            build_image "jleekwong/apache:latest" amd64 "jleekwong/php-apache"
-            build_image "jleekwong/apache:latest" arm64 "jleekwong/php-apache"
-            deploy_image "$repo" arm
-            deploy_image "$repo" amd64
-            deploy_image "$repo" arm64
-            tag=$(date +%Y%m%d%H%M)
-            tag2="latest"
+            #build_image "jleekwong/apache:latest" arm "jleekwong/php-apache"
+            #build_image "jleekwong/apache:latest" amd64 "jleekwong/php-apache"
+            #build_image "jleekwong/apache:latest" arm64 "jleekwong/php-apache"
+            #deploy_image "$repo" arm
+            #deploy_image "$repo" amd64
+            #deploy_image "$repo" arm64
+            #tag=$(date +%Y%m%d%H%M)
+            #tag2="latest"
             #echo $tag
             #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
             #docker manifest inspect $repo:$tag

From 568abd9cc3b3a9dbea939b3774745ae6f7e8f333 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:20:46 -0700
Subject: [PATCH 20/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0ac1a96..9456dda 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
           echo $flag
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            #build_image "jleekwong/apache:latest" arm "jleekwong/php-apache"
+            build_image "treehouses/apache:latest" arm "$repo"
             #build_image "jleekwong/apache:latest" amd64 "jleekwong/php-apache"
             #build_image "jleekwong/apache:latest" arm64 "jleekwong/php-apache"
             #deploy_image "$repo" arm

From 406ea9b4d84ae15dac1f5322e985b253bc4da344 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:25:29 -0700
Subject: [PATCH 21/33] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9456dda..be6d276 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,8 +43,8 @@ jobs:
           if [[ $flag == true ]]; then
             docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             build_image "treehouses/apache:latest" arm "$repo"
-            #build_image "jleekwong/apache:latest" amd64 "jleekwong/php-apache"
-            #build_image "jleekwong/apache:latest" arm64 "jleekwong/php-apache"
+            build_image "treehouses/apache:latest" amd64 "$repo"
+            build_image "treehouses/apache:latest" arm64 "$repo"
             #deploy_image "$repo" arm
             #deploy_image "$repo" amd64
             #deploy_image "$repo" arm64

From a912a8d885efc39be9681e53b6054ac20dd4eb10 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:34:14 -0700
Subject: [PATCH 22/33] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index be6d276..bb1829e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,7 +45,7 @@ jobs:
             build_image "treehouses/apache:latest" arm "$repo"
             build_image "treehouses/apache:latest" amd64 "$repo"
             build_image "treehouses/apache:latest" arm64 "$repo"
-            #deploy_image "$repo" arm
+            deploy_image "$repo" arm
             #deploy_image "$repo" amd64
             #deploy_image "$repo" arm64
             #tag=$(date +%Y%m%d%H%M)

From 1cfb8b077900d9d2b4d24490d8cb621b7782ff33 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:43:10 -0700
Subject: [PATCH 23/33] Update main.yml

---
 .github/workflows/main.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb1829e..6227afd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -46,11 +46,11 @@ jobs:
             build_image "treehouses/apache:latest" amd64 "$repo"
             build_image "treehouses/apache:latest" arm64 "$repo"
             deploy_image "$repo" arm
-            #deploy_image "$repo" amd64
-            #deploy_image "$repo" arm64
-            #tag=$(date +%Y%m%d%H%M)
-            #tag2="latest"
-            #echo $tag
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
+            tag=$(date +%Y%m%d%H%M)
+            tag2="latest"
+            echo $tag
             #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
             #docker manifest inspect $repo:$tag
             #docker manifest inspect $repo:$tag2

From 7d7448350058425eb1703ef335a4ac507288faec Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 01:52:52 -0700
Subject: [PATCH 24/33] Update main.yml

---
 .github/workflows/main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6227afd..80541e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,10 +51,10 @@ jobs:
             tag=$(date +%Y%m%d%H%M)
             tag2="latest"
             echo $tag
-            #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-            #docker manifest inspect $repo:$tag
-            #docker manifest inspect $repo:$tag2
-            #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
-          #else
-            #echo "no changes"
+            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            docker manifest inspect $repo:$tag
+            docker manifest inspect $repo:$tag2
+            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          else
+            echo "no changes"
           fi

From 27b130b068bba8dbd580dd86bb917284b5de7997 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:21:47 -0700
Subject: [PATCH 25/33] Update main.yml

---
 .github/workflows/main.yml | 72 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 80541e6..4b7e603 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,39 +22,39 @@ jobs:
           source .github/workflows/utils.sh
           php_apache_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
           echo $php_apache_arm_sha
-          nginx_arm_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm")
-          echo $nginx_arm_sha
-          flag_arm=$(is_base "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha)
-          echo $flag_arm
-          php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
-          echo $php_apache_amd64_sha
-          nginx_amd64_sha=$(get_manifest_sha "treehouses/nginx:latest" "amd64")
-          echo $nginx_amd64_sha
-          flag_amd64=$(is_base "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha)
-          echo $flag_amd64
-          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
-          echo $php_apache_arm64_sha
-          nginx_arm64_sha=$(get_manifest_sha "treehouses/nginx:latest" "arm64")
-          echo $nginx_arm64_sha
-          flag_arm64=$(is_base "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
-          echo $flag_arm64
-          flag=$(compare "treehouses/nginx@"$nginx_arm_sha "$repo@"$php_apache_arm_sha "treehouses/nginx@"$nginx_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/nginx@"$nginx_arm64_sha "$repo@"$php_apache_arm64_sha)
-          echo $flag
-          if [[ $flag == true ]]; then
-            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "treehouses/apache:latest" arm "$repo"
-            build_image "treehouses/apache:latest" amd64 "$repo"
-            build_image "treehouses/apache:latest" arm64 "$repo"
-            deploy_image "$repo" arm
-            deploy_image "$repo" amd64
-            deploy_image "$repo" arm64
-            tag=$(date +%Y%m%d%H%M)
-            tag2="latest"
-            echo $tag
-            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-            docker manifest inspect $repo:$tag
-            docker manifest inspect $repo:$tag2
-            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
-          else
-            echo "no changes"
-          fi
+          apache_arm_sha=$(get_manifest_sha "treehouses/apache:latest" "arm")
+          #echo $apache_arm_sha
+          #flag_arm=$(is_base "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
+          #echo $flag_arm
+          #php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
+          #echo $php_apache_amd64_sha
+          #apache_amd64_sha=$(get_manifest_sha "treehouses/apache:latest" "amd64")
+          #echo $apache_amd64_sha
+          #flag_amd64=$(is_base "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
+          #echo $flag_amd64
+          #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          #echo $php_apache_arm64_sha
+          #apache_arm64_sha=$(get_manifest_sha "treehouses/apache:latest" "arm64")
+          #echo $apache_arm64_sha
+          #flag_arm64=$(is_base "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          #echo $flag_arm64
+          #flag=$(compare "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          #echo $flag
+          #if [[ $flag == true ]]; then
+            #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            #build_image "treehouses/apache:latest" arm "$repo"
+            #build_image "treehouses/apache:latest" amd64 "$repo"
+            #build_image "treehouses/apache:latest" arm64 "$repo"
+            #deploy_image "$repo" arm
+            #deploy_image "$repo" amd64
+            #deploy_image "$repo" arm64
+            #tag=$(date +%Y%m%d%H%M)
+            #tag2="latest"
+            #echo $tag
+            #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            #docker manifest inspect $repo:$tag
+            #docker manifest inspect $repo:$tag2
+            #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          #else
+            #echo "no changes"
+          #fi

From 369b99a4c1837d52a230d02a33a8e8d1caf684ee Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:22:53 -0700
Subject: [PATCH 26/33] Update main.yml

---
 .github/workflows/main.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4b7e603..f12eee7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,20 +23,20 @@ jobs:
           php_apache_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
           echo $php_apache_arm_sha
           apache_arm_sha=$(get_manifest_sha "treehouses/apache:latest" "arm")
-          #echo $apache_arm_sha
-          #flag_arm=$(is_base "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
-          #echo $flag_arm
-          #php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
-          #echo $php_apache_amd64_sha
-          #apache_amd64_sha=$(get_manifest_sha "treehouses/apache:latest" "amd64")
-          #echo $apache_amd64_sha
-          #flag_amd64=$(is_base "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
-          #echo $flag_amd64
-          #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
-          #echo $php_apache_arm64_sha
-          #apache_arm64_sha=$(get_manifest_sha "treehouses/apache:latest" "arm64")
-          #echo $apache_arm64_sha
-          #flag_arm64=$(is_base "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $apache_arm_sha
+          flag_arm=$(is_base "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
+          echo $flag_arm
+          php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
+          echo $php_apache_amd64_sha
+          apache_amd64_sha=$(get_manifest_sha "treehouses/apache:latest" "amd64")
+          echo $apache_amd64_sha
+          flag_amd64=$(is_base "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
+          echo $flag_amd64
+          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          echo $php_apache_arm64_sha
+          apache_arm64_sha=$(get_manifest_sha "treehouses/apache:latest" "arm64")
+          echo $apache_arm64_sha
+          flag_arm64=$(is_base "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
           #echo $flag_arm64
           #flag=$(compare "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
           #echo $flag

From e04a4bcf30ac4a6cf0e6ef991a37927cb8a5f47a Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:25:35 -0700
Subject: [PATCH 27/33] Update main.yml

---
 .github/workflows/main.yml | 42 +++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f12eee7..5608071 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,24 +37,24 @@ jobs:
           apache_arm64_sha=$(get_manifest_sha "treehouses/apache:latest" "arm64")
           echo $apache_arm64_sha
           flag_arm64=$(is_base "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
-          #echo $flag_arm64
-          #flag=$(compare "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
-          #echo $flag
-          #if [[ $flag == true ]]; then
-            #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            #build_image "treehouses/apache:latest" arm "$repo"
-            #build_image "treehouses/apache:latest" amd64 "$repo"
-            #build_image "treehouses/apache:latest" arm64 "$repo"
-            #deploy_image "$repo" arm
-            #deploy_image "$repo" amd64
-            #deploy_image "$repo" arm64
-            #tag=$(date +%Y%m%d%H%M)
-            #tag2="latest"
-            #echo $tag
-            #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-            #docker manifest inspect $repo:$tag
-            #docker manifest inspect $repo:$tag2
-            #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
-          #else
-            #echo "no changes"
-          #fi
+          echo $flag_arm64
+          flag=$(compare "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag
+          if [[ $flag == true ]]; then
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            build_image "treehouses/apache:latest" arm "$repo"
+            build_image "treehouses/apache:latest" amd64 "$repo"
+            build_image "treehouses/apache:latest" arm64 "$repo"
+            deploy_image "$repo" arm
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
+            tag=$(date +%Y%m%d%H%M)
+            tag2="latest"
+            echo $tag
+            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            docker manifest inspect $repo:$tag
+            docker manifest inspect $repo:$tag2
+            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          else
+            echo "no changes"
+          fi

From d46491e8f3872bd22b3666d698b84e80e19564ce Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:46:13 -0700
Subject: [PATCH 28/33] Update main.yml

---
 .github/workflows/main.yml | 72 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5608071..960c9ec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,43 +18,43 @@ jobs:
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
           repo="jleekwong/php-apache"
-          base="php_apache"
+          base="treehouses/apache"
           source .github/workflows/utils.sh
           php_apache_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
           echo $php_apache_arm_sha
-          apache_arm_sha=$(get_manifest_sha "treehouses/apache:latest" "arm")
+          apache_arm_sha=$(get_manifest_sha "$base:latest" "arm")
           echo $apache_arm_sha
-          flag_arm=$(is_base "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
-          echo $flag_arm
-          php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
-          echo $php_apache_amd64_sha
-          apache_amd64_sha=$(get_manifest_sha "treehouses/apache:latest" "amd64")
-          echo $apache_amd64_sha
-          flag_amd64=$(is_base "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
-          echo $flag_amd64
-          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
-          echo $php_apache_arm64_sha
-          apache_arm64_sha=$(get_manifest_sha "treehouses/apache:latest" "arm64")
-          echo $apache_arm64_sha
-          flag_arm64=$(is_base "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
-          echo $flag_arm64
-          flag=$(compare "treehouses/apache@"$apache_arm_sha "$repo@"$php_apache_arm_sha "treehouses/apache@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
-          echo $flag
-          if [[ $flag == true ]]; then
-            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            build_image "treehouses/apache:latest" arm "$repo"
-            build_image "treehouses/apache:latest" amd64 "$repo"
-            build_image "treehouses/apache:latest" arm64 "$repo"
-            deploy_image "$repo" arm
-            deploy_image "$repo" amd64
-            deploy_image "$repo" arm64
-            tag=$(date +%Y%m%d%H%M)
-            tag2="latest"
-            echo $tag
-            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-            docker manifest inspect $repo:$tag
-            docker manifest inspect $repo:$tag2
-            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
-          else
-            echo "no changes"
-          fi
+          #flag_arm=$(is_base "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
+          #echo $flag_arm
+          #php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
+          #echo $php_apache_amd64_sha
+          #apache_amd64_sha=$(get_manifest_sha "$base:latest" "amd64")
+          #echo $apache_amd64_sha
+          #flag_amd64=$(is_base "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
+          #echo $flag_amd64
+          #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          #echo $php_apache_arm64_sha
+          #apache_arm64_sha=$(get_manifest_sha "$base:latest" "arm64")
+          #echo $apache_arm64_sha
+          #flag_arm64=$(is_base "$base@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          #echo $flag_arm64
+          #flag=$(compare "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          #echo $flag
+          #if [[ $flag == true ]]; then
+            #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            #build_image "$base:latest" arm "$repo"
+            #build_image "$base:latest" amd64 "$repo"
+            #build_image "$base:latest" arm64 "$repo"
+            #deploy_image "$repo" arm
+            #deploy_image "$repo" amd64
+            #deploy_image "$repo" arm64
+            #tag=$(date +%Y%m%d%H%M)
+            #tag2="latest"
+            #echo $tag
+            #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            #docker manifest inspect $repo:$tag
+            #docker manifest inspect $repo:$tag2
+            #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          #else
+            #echo "no changes"
+          #fi

From 3313c78c1470f9d0672950ab928436ba627410d6 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:51:50 -0700
Subject: [PATCH 29/33] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 960c9ec..4d9370d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,8 +24,8 @@ jobs:
           echo $php_apache_arm_sha
           apache_arm_sha=$(get_manifest_sha "$base:latest" "arm")
           echo $apache_arm_sha
-          #flag_arm=$(is_base "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
-          #echo $flag_arm
+          flag_arm=$(is_base "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
+          echo $flag_arm
           #php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           #echo $php_apache_amd64_sha
           #apache_amd64_sha=$(get_manifest_sha "$base:latest" "amd64")

From d8eec73d102388df2bbffeca908ba95036bc9ffd Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:55:01 -0700
Subject: [PATCH 30/33] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4d9370d..95a22ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,8 +26,8 @@ jobs:
           echo $apache_arm_sha
           flag_arm=$(is_base "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha)
           echo $flag_arm
-          #php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
-          #echo $php_apache_amd64_sha
+          php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
+          echo $php_apache_amd64_sha
           #apache_amd64_sha=$(get_manifest_sha "$base:latest" "amd64")
           #echo $apache_amd64_sha
           #flag_amd64=$(is_base "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)

From a7bf294fe811c80c18fa74d17d2d8946077997f9 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:56:35 -0700
Subject: [PATCH 31/33] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95a22ed..64f25b1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,8 +28,8 @@ jobs:
           echo $flag_arm
           php_apache_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           echo $php_apache_amd64_sha
-          #apache_amd64_sha=$(get_manifest_sha "$base:latest" "amd64")
-          #echo $apache_amd64_sha
+          apache_amd64_sha=$(get_manifest_sha "$base:latest" "amd64")
+          echo $apache_amd64_sha
           #flag_amd64=$(is_base "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
           #echo $flag_amd64
           #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")

From c37178c06cdf1fe7f653c753ca6af62abecab8b8 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 16:58:28 -0700
Subject: [PATCH 32/33] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 64f25b1..553b3fc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,8 +30,8 @@ jobs:
           echo $php_apache_amd64_sha
           apache_amd64_sha=$(get_manifest_sha "$base:latest" "amd64")
           echo $apache_amd64_sha
-          #flag_amd64=$(is_base "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
-          #echo $flag_amd64
+          flag_amd64=$(is_base "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
+          echo $flag_amd64
           #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
           #echo $php_apache_arm64_sha
           #apache_arm64_sha=$(get_manifest_sha "$base:latest" "arm64")

From 245686852e42545b2b0be55e0d46438dbcf362f6 Mon Sep 17 00:00:00 2001
From: JLKwong <61807745+JLKwong@users.noreply.github.com>
Date: Fri, 30 Apr 2021 17:07:33 -0700
Subject: [PATCH 33/33] Update main.yml

---
 .github/workflows/main.yml | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 553b3fc..ac2a2b8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,29 +32,29 @@ jobs:
           echo $apache_amd64_sha
           flag_amd64=$(is_base "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha)
           echo $flag_amd64
-          #php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
-          #echo $php_apache_arm64_sha
-          #apache_arm64_sha=$(get_manifest_sha "$base:latest" "arm64")
-          #echo $apache_arm64_sha
-          #flag_arm64=$(is_base "$base@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
-          #echo $flag_arm64
-          #flag=$(compare "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
-          #echo $flag
-          #if [[ $flag == true ]]; then
-            #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-            #build_image "$base:latest" arm "$repo"
-            #build_image "$base:latest" amd64 "$repo"
-            #build_image "$base:latest" arm64 "$repo"
-            #deploy_image "$repo" arm
-            #deploy_image "$repo" amd64
-            #deploy_image "$repo" arm64
-            #tag=$(date +%Y%m%d%H%M)
-            #tag2="latest"
-            #echo $tag
-            #create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-            #docker manifest inspect $repo:$tag
-            #docker manifest inspect $repo:$tag2
-            #docker manifest push $repo:$tag; docker manifest push $repo:$tag2
-          #else
-            #echo "no changes"
-          #fi
+          php_apache_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          echo $php_apache_arm64_sha
+          apache_arm64_sha=$(get_manifest_sha "$base:latest" "arm64")
+          echo $apache_arm64_sha
+          flag_arm64=$(is_base "$base@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag_arm64
+          flag=$(compare "$base@"$apache_arm_sha "$repo@"$php_apache_arm_sha "$base@"$apache_amd64_sha "$repo@"$php_apache_amd64_sha "treehouses/apache@"$apache_arm64_sha "$repo@"$php_apache_arm64_sha)
+          echo $flag
+          if [[ $flag == true ]]; then
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            build_image "$base:latest" arm "$repo"
+            build_image "$base:latest" amd64 "$repo"
+            build_image "$base:latest" arm64 "$repo"
+            deploy_image "$repo" arm
+            deploy_image "$repo" amd64
+            deploy_image "$repo" arm64
+            tag=$(date +%Y%m%d%H%M)
+            tag2="latest"
+            echo $tag
+            create_manifest $repo $tag $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            docker manifest inspect $repo:$tag
+            docker manifest inspect $repo:$tag2
+            docker manifest push $repo:$tag; docker manifest push $repo:$tag2
+          else
+            echo "no changes"
+          fi