From b56be77ee7fa1d13d1057c8f135dd697e3d90861 Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Mon, 4 Jul 2022 17:02:52 -0300
Subject: [PATCH 1/2] fix(docker): avoid tagging elixir image as latest

---
 .github/workflows/build_and_push_docker_images.yaml | 3 +++
 scripts/docker-create-push-manifests.sh             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index c6b9c5a8d..dace85007 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -323,4 +323,7 @@ jobs:
         if: ${{ needs.prepare.outputs.IS_EXACT_TAG }}
         working-directory: source
         run: |
+          if [ ${{ matrix.build_elixir }} = 'with_elixir' ]; then
+            export IS_ELIXIR=yes
+          fi
           scripts/docker-create-push-manifests.sh "${{ steps.meta.outputs.tags }}" "${{ needs.prepare.outputs.IS_DOCKER_LATEST }}"
diff --git a/scripts/docker-create-push-manifests.sh b/scripts/docker-create-push-manifests.sh
index 7c67ae788..b101b1653 100755
--- a/scripts/docker-create-push-manifests.sh
+++ b/scripts/docker-create-push-manifests.sh
@@ -18,7 +18,7 @@ docker manifest create "${img_march}" \
 docker manifest push "${img_march}"
 
 # PUSH latest if it is a release build
-if [ "$IsPushLatest" = "true" ]; then
+if [ "$IsPushLatest" = "true" -a "${IS_ELIXIR:-no}" = "no" ]; then
     img_latest=$(echo "$img_arm64" | cut -d: -f 1):latest
     docker manifest create "${img_latest}" \
         --amend "$img_amd64_digest" \

From 8296e004a0163d27f216ebca23e3699a891766dc Mon Sep 17 00:00:00 2001
From: Thales Macedo Garitezi <thalesmg@gmail.com>
Date: Tue, 5 Jul 2022 09:01:00 -0300
Subject: [PATCH 2/2] refactor(ci): use more generic script

---
 .github/workflows/build_and_push_docker_images.yaml | 6 ++++--
 scripts/docker-create-push-manifests.sh             | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index dace85007..f678d444a 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -324,6 +324,8 @@ jobs:
         working-directory: source
         run: |
           if [ ${{ matrix.build_elixir }} = 'with_elixir' ]; then
-            export IS_ELIXIR=yes
+            is_latest=false
+          else
+            is_latest="${{ needs.prepare.outputs.IS_DOCKER_LATEST }}"
           fi
-          scripts/docker-create-push-manifests.sh "${{ steps.meta.outputs.tags }}" "${{ needs.prepare.outputs.IS_DOCKER_LATEST }}"
+          scripts/docker-create-push-manifests.sh "${{ steps.meta.outputs.tags }}" "$is_latest"
diff --git a/scripts/docker-create-push-manifests.sh b/scripts/docker-create-push-manifests.sh
index b101b1653..7c67ae788 100755
--- a/scripts/docker-create-push-manifests.sh
+++ b/scripts/docker-create-push-manifests.sh
@@ -18,7 +18,7 @@ docker manifest create "${img_march}" \
 docker manifest push "${img_march}"
 
 # PUSH latest if it is a release build
-if [ "$IsPushLatest" = "true" -a "${IS_ELIXIR:-no}" = "no" ]; then
+if [ "$IsPushLatest" = "true" ]; then
     img_latest=$(echo "$img_arm64" | cut -d: -f 1):latest
     docker manifest create "${img_latest}" \
         --amend "$img_amd64_digest" \