summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-10-16 15:38:33 +0200
committerGitHub <noreply@github.com>2019-10-16 15:38:33 +0200
commitb3d67b7f1f4b8929b477b36e8e2b1463022fb93b (patch)
tree1bba074a6e5e48317e552591b916847e5ab69cfe /docker
parentc293b710ab331612ec714c89abb286e0f7c6b7d1 (diff)
parent9e5435a6ce462c8d1a6327a3ae48987190e4cec4 (diff)
downloadvyos-build-b3d67b7f1f4b8929b477b36e8e2b1463022fb93b.tar.gz
vyos-build-b3d67b7f1f4b8929b477b36e8e2b1463022fb93b.zip
Merge pull request #62 from jestabro/T1710
T1710: [equuleus] buster: add patch to fix live-build missing key error
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile17
1 files changed, 16 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 78102ae3..dfb4a35a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -68,7 +68,8 @@ RUN apt-get update && apt-get install -y \
pkg-config \
debhelper \
gosu \
- live-build \
+ po4a \
+ cpio \
jq
# Package needed for mdns-repeater
@@ -294,6 +295,20 @@ RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packe
chmod +x /usr/bin/packer
#
+# live-build: building with local packages fails due to missing keys
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941691
+# https://salsa.debian.org/live-team/live-build/merge_requests/30
+#
+RUN wget https://salsa.debian.org/jestabro-guest/live-build/commit/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
+ git clone https://salsa.debian.org/live-team/live-build.git && \
+ cd live-build && \
+ git checkout debian/1%20190311 && \
+ patch -p1 < ../63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
+ dch -n "Applying fix for missing archive keys" && \
+ dpkg-buildpackage -us -uc && \
+ sudo dpkg -i ../live-build*.deb
+
+#
# live-build: building in docker fails with mounting /proc | /sys
#
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659