From edba92e41291a4e391ccef15ecabdb4c888732cf Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 21 Apr 2020 11:51:59 +1000 Subject: [PATCH] Dockerfile: incorporate workaround deboostrap As described in the updated comment section, this debootstrap from the openstack-ci PPA works around some issues building inside a container. Change-Id: I0887a801bb6dd4ce992c39d9e332a18f8194a7b9 --- Dockerfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f57bf2d93..0cda51178 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,14 +47,23 @@ FROM nodepool-base as nodepool-builder RUN echo "nodepool ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/nodepool-sudo \ && chmod 0440 /etc/sudoers.d/nodepool-sudo -# binary deps; see -# https://docs.openstack.org/diskimage-builder/latest/developer/vhd_creation.html -# about the vhd-util deps +# We have some out-of-tree of binary dependencies expressed below: +# +# * vhd-util is required to create .vhd images, mostly used in +# Rackspace. For full details see: +# https://docs.openstack.org/diskimage-builder/latest/developer/vhd_creation.html +# +# * debootstrap unmounts /proc in the container causing havoc when +# using -minimal elements on debuntu. Two unmerged fixes: +# https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/26 +# https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/27 +# are incoporated into the openstack-ci-core version RUN \ apt-get update \ && apt-get install -y gnupg2 \ && apt-key adv --keyserver keyserver.ubuntu.com --recv 2B5DE24F0EC9F98BD2F85CA315B6CE7C018D05F5 \ && echo "deb http://ppa.launchpad.net/openstack-ci-core/vhd-util/ubuntu bionic main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/openstack-ci-core/debootstrap/ubuntu focal main" >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y \ curl \