From 3cd5d26766d410f7d8775a54ea673ae8b3668e20 Mon Sep 17 00:00:00 2001 From: Paul Carver Date: Wed, 10 Feb 2021 16:41:30 +0000 Subject: [PATCH] Pin pip to 20.3.3 and disable tmpfs in DIB These changes are needed to fix the broken Arm64 build. Upgrading to latest pip results in a syntax error in an existing script. Disk Image Builder tries to build the image in a tmpfs that is limited by RAM which is too small for the Arm64 image. Signed-off-by: Paul Carver Change-Id: Icf3a896b8ebef04b81bc675e2d63759641e96284 --- create_golden_image.sh | 2 +- docker-context/Dockerfile-dib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/create_golden_image.sh b/create_golden_image.sh index 2a9d66a..c51f9d4 100755 --- a/create_golden_image.sh +++ b/create_golden_image.sh @@ -56,6 +56,6 @@ DIB_DEBUG_TRACE=1 \ DIB_YUM_REPO_CONF="${REPO_FILES}/repositories.repo ${REPO_FILES}/localrepo.repo" \ DIB_LOCAL_IMAGE=$WORKTMP/base-img/$BASE_IMAGE_NAME \ ELEMENTS_PATH=$scriptdir/dib_elements/ \ - /usr/bin/disk-image-create --root-label img-rootfs --image-size $BASE_IMAGE_SIZE vm centos7 selinux-permissive myproduct ${EXTRA_ELEMENTS:-} -o $TMP_GOLDEN_IMAGE + /usr/bin/disk-image-create --root-label img-rootfs --no-tmpfs --image-size $BASE_IMAGE_SIZE vm centos7 selinux-permissive myproduct ${EXTRA_ELEMENTS:-} -o $TMP_GOLDEN_IMAGE rm -rf $WORKTMP/base-img diff --git a/docker-context/Dockerfile-dib b/docker-context/Dockerfile-dib index d1bb65f..269901a 100644 --- a/docker-context/Dockerfile-dib +++ b/docker-context/Dockerfile-dib @@ -37,7 +37,7 @@ RUN \ xfsprogs \ qemu-img \ ${EXTRA_RPM:-} && \ - pip install --upgrade pip && \ + pip install --upgrade pip==20.3.3 && \ pip install diskimage-builder==2.26.1 && \ pip install zipp && \ true && \ -- 2.16.6