Skip to content

Commit 54d0c1e

Browse files
committed
test images: Removes -p yes flag from qemu-user-static script call
Currently, the Image Builder job is failing as it cannot build images for other architecture types. This happens because the Image Builder image does not have any of the expected qemu-* binaries in /usr/bin/ needed in order to run qemu-binfmt-conf.sh with the -p yes flag, so that flag is removed.
1 parent 0269e2d commit 54d0c1e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

test/images/image-util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ build() {
149149
if [[ $(id -u) != 0 ]]; then
150150
sudo=sudo
151151
fi
152-
${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset -p yes
152+
${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset
153153
curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/"${QEMUVERSION}"/x86_64_qemu-"${QEMUARCHS[$arch]}"-static.tar.gz | tar -xz -C "${temp_dir}"
154154
# Ensure we don't get surprised by umask settings
155155
chmod 0755 "${temp_dir}/qemu-${QEMUARCHS[$arch]}-static"
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
Files copied from https://github.com/multiarch/qemu-user-static at commit 22b0013668d2aed4a2cfd21650e85c664b1f21c6.
1+
qemu-binfmt-confg.sh comes from https://github.com/qemu/qemu/blob/7c81570d932268a9626457a662f1c5046ebc455e/scripts/qemu-binfmt-conf.sh
2+
register.sh comes from https://github.com/multiarch/qemu-user-static/blob/9898439ca975c9c4c0db2bdc4b3707d382559d09/containers/latest/register.sh

0 commit comments

Comments
 (0)