From 3917930a7697aaea92bd2cad74dc7f2764d947f8 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Fri, 17 May 2024 11:42:49 +0200 Subject: [PATCH] CI: Append arch type to initramfs-cryptsetup image This commit is to append an arch type to the initramfs-cryptsetup image to prevent a wrong arch image from being pulled on a different arch host. Fixes: #9654 Signed-off-by: Hyounggyu Choi --- tools/packaging/static-build/initramfs/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/static-build/initramfs/build.sh b/tools/packaging/static-build/initramfs/build.sh index fcbfeaef7..065520ff7 100755 --- a/tools/packaging/static-build/initramfs/build.sh +++ b/tools/packaging/static-build/initramfs/build.sh @@ -32,7 +32,7 @@ package_output_dir="${package_output_dir:-}" [ -n "${lvm2_repo}" ] || die "Failed to get lvm2 repo" [ -n "${lvm2_version}" ] || die "Failed to get lvm2 version" -container_image="${BUILDER_REGISTRY}:initramfs-cryptsetup-${cryptsetup_version}-lvm2-${lvm2_version}-$(get_last_modification ${repo_root_dir} ${script_dir})" +container_image="${BUILDER_REGISTRY}:initramfs-cryptsetup-${cryptsetup_version}-lvm2-${lvm2_version}-$(get_last_modification ${repo_root_dir} ${script_dir})-$(uname -m)" sudo docker pull ${container_image} || (sudo docker build \ --build-arg cryptsetup_repo="${cryptsetup_repo}" \