From e9e4970ff00bbeac7d2d0bc8e024873087ff9706 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 10 Oct 2024 16:38:58 -0700 Subject: [PATCH] container/build.sh: fix arm architecture tagging The wrong string was used for comparison, and for tagging, so the arm64 branch and sha1 images overwrote and destroyed the amd64 images. Signed-off-by: Dan Mick (cherry picked from commit 7e03ee798f4ed3aa4a0bb1a9e9d62df52e54406d) --- container/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container/build.sh b/container/build.sh index 7c97e2261c16f..5edf469d2d2e4 100755 --- a/container/build.sh +++ b/container/build.sh @@ -136,9 +136,9 @@ if [[ ${CI_CONTAINER} == "true" ]] ; then branch_repo_tag=$repopath/ceph:${BRANCH} sha1_repo_tag=$repopath/ceph:${CEPH_SHA1} - if [[ "${ARCH}" == "aarch64" ]] ; then - branch_repo_tag=${branch_repo_tag}-aarch64 - sha1_repo_tag=${sha1_repo_tag}-aarch64 + if [[ "${ARCH}" == "arm64" ]] ; then + branch_repo_tag=${branch_repo_tag}-arm64 + sha1_repo_tag=${sha1_repo_tag}-arm64 fi podman tag ${image_id} ${full_repo_tag} -- 2.39.5