From a7fa75eb0257a4aff4083ecef156fad1486b0b36 Mon Sep 17 00:00:00 2001
From: Jaroslav Fedor <jaroslav.fedor@solarwinds.com>
Date: Wed, 16 Oct 2024 14:49:52 +0200
Subject: [PATCH] Fix taging

---
 .github/workflows/build-and-release.yaml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
index cd2e946c..9326b061 100644
--- a/.github/workflows/build-and-release.yaml
+++ b/.github/workflows/build-and-release.yaml
@@ -169,8 +169,6 @@ jobs:
             k8s-relay
           )
 
-          architectures=("amd64")
-
           # strip potential "https://" prefix and trailing slashes from docker registry
           docker_registry=$(sed -e 's,^https://,,' -e 's,/*$,,' <<< $DOCKER_REGISTRY)
 
@@ -178,21 +176,21 @@ jobs:
             image_name="${IMAGE_PREFIX}${image}"
             image_path="${docker_registry}/${DOCKER_NAMESPACE}/${image_name}"
 
-            for arch in ${architectures[@]}; do
-              docker tag "${image}-${arch}" ${image_path}:v${full_version_number}-${arch}
+            docker tag "${image}" ${image_path}:v${full_version_number}-amd64
+            docker tag "${image}-arm64" ${image_path}:v${full_version_number}-arm64
 
-              if [[ "${{ inputs.dry_run }}" == "false" ]];
-              then
-                docker push ${image_path}:v${full_version_number}-${arch}
-              else
-                echo "Would run: docker push ${image_path}:v${full_version_number}-${arch}"
-              fi
-            done
+            if [[ "${{ inputs.dry_run }}" == "false" ]];
+            then
+              docker push ${image_path}:v${full_version_number}-arm64
+              docker push ${image_path}:v${full_version_number}-amd64
+            else
+              echo "Would run: docker push ${image_path}:v${full_version_number}-{arm64,amd64}"
+            fi
 
             for tag in ${tags[@]}; do
               manifest_cmd="docker manifest create ${image_path}:${tag}"
-              manifest_cmd="${manifest_cmd} --amend ${image_path}:v${full_version_number}"
-              manifest_cmd="${manifest_cmd} --amend ${image_path}:v${full_version_number}-${arch}"
+              manifest_cmd="${manifest_cmd} --amend ${image_path}:v${full_version_number}-arm64"
+              manifest_cmd="${manifest_cmd} --amend ${image_path}:v${full_version_number}-amd64"
 
 
               if [[ "${{ inputs.dry_run }}" == "false" ]]; then