summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-07-20 20:25:01 +0200
committerChristian Poessinger <christian@poessinger.com>2019-07-20 20:25:01 +0200
commitdee58b509635af77a832ed124390b9d1f332cb52 (patch)
treed9599be94bf120d31015908e64f57007996b0ba2 /docker
parent43e313ae96227e29990a4a201acd5d6c64f22f33 (diff)
downloadvyos-build-dee58b509635af77a832ed124390b9d1f332cb52.tar.gz
vyos-build-dee58b509635af77a832ed124390b9d1f332cb52.zip
Docker: add pached debootstrap
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile16
1 files changed, 16 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 733b16a4..69c76ddb 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -283,6 +283,22 @@ RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packe
curl -K- | gzip -d > /usr/bin/packer && \
chmod +x /usr/bin/packer
+#
+# live-build: building in docker fails with mounting /proc | /sys
+#
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921815
+# https://salsa.debian.org/installer-team/debootstrap/merge_requests/26
+#
+RUN wget https://salsa.debian.org/klausenbusk-guest/debootstrap/commit/a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
+ git clone https://salsa.debian.org/installer-team/debootstrap && \
+ cd debootstrap && \
+ git checkout 1.0.114 && \
+ patch -p1 < ../a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
+ dch -n "Applying fix for docker image compile" && \
+ dpkg-buildpackage -us -uc && \
+ sudo dpkg -i ../debootstrap*.deb
+
# Allow password-less 'sudo' for all users in group 'sudo'
RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/gosu /usr/sbin/usermod