Keep amd image without arch so tests are happy

solarwinds · Oct 16, 2024 · b0e9f22 · b0e9f22
1 parent 4a52c2f
commit b0e9f22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -169,7 +169,7 @@ jobs:
             k8s-relay
           )
 
-          architectures=("amd64" "arm64")
+          architectures=("amd64")
 
           # strip potential "https://" prefix and trailing slashes from docker registry
           docker_registry=$(sed -e 's,^https://,,' -e 's,/*$,,' <<< $DOCKER_REGISTRY)
@@ -191,10 +191,9 @@ jobs:
 
             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}"
 
-              for arch in ${architectures[@]}; do
-                manifest_cmd="${manifest_cmd} --amend ${image_path}:v${full_version_number}-${arch}"
-              done
 
               if [[ "${{ inputs.dry_run }}" == "false" ]]; then
                 eval $manifest_cmd

diff --git a/cmake/docker-utils.cmake b/cmake/docker-utils.cmake
@@ -162,7 +162,7 @@ function(build_custom_docker_image IMAGE_NAME)
       WORKING_DIRECTORY
         "${out_path}"
       COMMAND
-        docker buildx build --platform linux/amd64 -t "${IMAGE_NAME}-amd64" ${DOCKER_ARGS} .
+        docker buildx build --platform linux/amd64 -t "${IMAGE_NAME}" ${DOCKER_ARGS} .
     )
   endif()