From ec609b409a74b0f531b1eba43bb09e22db76ee10 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 7 Apr 2019 12:46:26 +0200 Subject: Docker: update build system to Debian Buster --- docker/Dockerfile | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 36895335..9101a52e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,17 +16,11 @@ # Must be run with --privileged flag, recommended to run the container with a # volume mapped in order to easy export images -FROM debian:jessie +FROM debian:buster LABEL authors="VyOS Maintainers " ENV DEBIAN_FRONTEND noninteractive -COPY sources.list /etc/apt/sources.list -COPY no--check-valid-until /etc/apt/apt.conf.d/ -COPY vyos-dev.key /tmp/vyos-dev.key - -RUN apt-key add /tmp/vyos-dev.key - # Standard shell should be bash not dash RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ dpkg-reconfigure dash @@ -69,13 +63,12 @@ RUN apt-get update && apt-get install -y \ python3-coverage \ python3-sphinx \ python3-pystache \ - pkg-config \ - debhelper - -RUN apt-get update && apt-get install -y -t jessie-backports \ python3-git \ python3-pip \ - gosu + pkg-config \ + debhelper \ + gosu \ + live-build # # Building libvyosconf requires a full configured OPAM/OCaml setup @@ -124,7 +117,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ dpkg -i ../libvyosconfig0_*_amd64.deb # Package needed for mdns-repeater -RUN apt-get update && apt-get install -y -t jessie-backports \ +RUN apt-get update && apt-get install -y \ dh-systemd # Packages needed for vyatta-cfg @@ -161,7 +154,6 @@ RUN apt-get update && apt-get install -y \ # Packages needed for kernel RUN apt-get update && apt-get install -y \ - kernel-package \ libncurses5-dev \ flex \ bison \ @@ -224,16 +216,10 @@ RUN apt-get update && apt-get install -y \ # Packages needed for ipaddrcheck RUN apt-get update && apt-get install -y \ + libcidr0 \ + libcidr-dev \ check -# As there is no Debian Jessie/Stretch package for libcidr available but this -# is required for ipaddrcheck we have to build it from source -RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ - cd analytics-libcidr && \ - git checkout 026c611d90a1 && \ - dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libcidr*.deb - # Packages needed for lldpd RUN apt-get update && apt-get install -y \ libbsd-dev \ @@ -269,14 +255,6 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ xmlto -# Update live-build -RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \ - apt-get update && apt-get install -y -t stretch \ - live-build && \ - rm -f /etc/apt/sources.list.d/stretch.list && \ - apt-get update && \ - rm -rf /var/lib/apt/lists/* - # Install packer RUN apt-get update && apt-get install -y \ jq -- cgit v1.2.3 From 369220ab4cdd70c0982b75894dd03c2c23c74c0d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 25 Apr 2019 17:47:48 +0200 Subject: Docker: add python-setuptools as dependency of vyos-strongswan --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 9101a52e..26fa9f85 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -245,7 +245,8 @@ RUN apt-get update && apt-get install -y \ libsqlite3-dev \ dh-apparmor \ gperf \ - libsystemd-dev + libsystemd-dev \ + python-setuptools # Packages needed for vyos-opennhrp RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From 3461366285233f2b3237f4a7c88c1da58f24a53d Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 25 Apr 2019 18:06:08 +0200 Subject: Docker: add bc, kmod as dependency of vyos-kernel --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 26fa9f85..e43c6bbd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -157,7 +157,9 @@ RUN apt-get update && apt-get install -y \ libncurses5-dev \ flex \ bison \ - libelf-dev + libelf-dev \ + bc \ + kmod # Packages needed for vyos-accel-ppp RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From 4e37abb232deebe68cbdf7e550305c150807be64 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 26 Apr 2019 18:32:40 +0200 Subject: Docker: fix libmysqlclient-dev package name --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index a7d18fef..c23c41f3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -142,7 +142,7 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ libpcap-dev \ libpq-dev \ - libmysqlclient-dev \ + default-libmysqlclient-dev \ libgeoip-dev \ librabbitmq-dev \ libjansson-dev \ -- cgit v1.2.3 From eb4b45134875f8f9446f0ff39ac1ca02325a0bdf Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 26 Apr 2019 18:43:08 +0200 Subject: Docker: remove non-required dev.packages.vyos.net repo Debian Buster ships all required packages and thus we do not need to fallback to dev.packages.vyos.net for help. --- docker/Dockerfile | 13 ------------- docker/vyos-dev.key | 32 -------------------------------- 2 files changed, 45 deletions(-) delete mode 100644 docker/vyos-dev.key (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index c23c41f3..c5e0b4d2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -182,14 +182,6 @@ RUN export RTRLIB_VERSION="0.6.3" && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb -# -# Setup VyOS Debian repository -# -COPY vyos-dev.key /tmp/vyos-dev.key -RUN apt-key add /tmp/vyos-dev.key -RUN echo "deb http://dev.packages.vyos.net/repositories/current/debian/ current main" \ - > /etc/apt/sources.list.d/vyos.list - # Packages needed to build frr itself # libyang-dev packages are hsoted on dev.packages.vyos.net see # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst @@ -205,11 +197,6 @@ RUN apt-get update && apt-get install -y \ python3-pytest \ texinfo -# -# Cleanup VyOS Debian Repository -# -RUN rm -f /etc/apt/sources.list.d/vyos.list - # Packages needed for conntrack-tools RUN apt-get update && apt-get install -y \ libnetfilter-conntrack-dev \ diff --git a/docker/vyos-dev.key b/docker/vyos-dev.key deleted file mode 100644 index a6522e36..00000000 --- a/docker/vyos-dev.key +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFOQPGwBCADjm8Oq3kaJQh0rI33XVfd9mNq5ffay884SlDCbG1hkLVf8tnGV -cjH7/nFfJdW/6Gr4dj4LQuHHnin5QeWnlHfuOySlOEsJCNP5dm14oEjy7epSXOv2 -A3m2tPDDqwMgfrOyw1gN+Clit9QIujiRzbcakqearyNxcVNvinIVunNiWbAyIhvc -uI6yfMjno4q/O83c7e1zBqJj9t9guQjBuqaJrmZVf985/6ue9yWzSI4JtzxVmhKI -dfCxHWE7BiEt2hnZPSVGcb4q6cBrkpcra7Ny55eoyN51wQGokPv3a9/8b3r5speR -gene2MTvD/3eZOtTvMN000f/gJX4E6o8xx+fABEBAAG0R1Z5T1MgTWFpbnRhaW5l -cnMgKERldmVsb3BtZW50IGFuZCB0ZXN0aW5nIHJlcG9zKSA8bWFpbnRhaW5lcnNA -dnlvcy5uZXQ+iQE4BBMBAgAiBQJTkDxsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe -AQIXgAAKCRAywkm9DfBLXJbHB/4xlwn+6cZGEWWNZgXwUTMeHubZItl1o3Tbrzaa -E3EqYyHJMYb3gBLOomlw7JLw5qT/247tlPC8ricl+BpeE5vYA3a08mIpcymROFh6 -pKJLNvdZHjrVN9yH2xYifI5sIDyuPga8Bgq/BMRiB1ragS/on2aUs75+tsEI32NI -JO8+jIav0Nd6n/Wmw55ioTXS3fx6VDb64D80luOf1ve5LFDs8Oz2I+ZjSf7mPMY/ -b9qQHNb/300k/tIeK2F4G7LFu6o/1YMlrv0Ry7j9BsLzIkmTh0pX4mSVvF6IrxsZ -WJRKu3uQDH2qccjptZDq4jHo/ow+aWT8rakjOgL9nJgKD5u/uQENBFOQPGwBCAC0 -zHpsmcfUIDyflGL+vwHV/3L02/vItHXfIkugL+wFB9C9i6nWA1KqNJwqNflJLGQF -y+vHXs0oa3oMKj7S3p2zTbuU8s9Vz2Cg5c15sy7yGjh/LTwVOR5ZJrgbRJxTTp9K -j5bkrx/DbDjIQ5szyjZ5N1ZAUyUx5Z/xMB3mTnLxDASvaoq+/F6WNcYY7NzjI7M0 -SFtnZLj6MFUVTmSbyYdGQc/Cxu5Utl7WKJUqHW5z10vJruZsdKV2+vf98yqhAJ+v -wPhKUoVD+KtCH/CrHFrVq0hCKIMtyPLtaTeR/QnCNDEsV4p82HB9KQOYEADEL3/A -a7Dntf3Xi+5eO/3MlnshABEBAAGJAR8EGAECAAkFAlOQPGwCGwwACgkQMsJJvQ3w -S1z+wwf9GnVn9GhbB1FhKQdavljp9rUzz8FvH3tRpftdhhJ8B0PVAMl4QRcIXrgD -nyd1K9ggzyWa4Z/9PygvH0Njv4YWlZh900wei9uVD8am1ncgQ/Jqlb36WvXyr8W/ -VPzQDtKAOkUz6RhKQ4V6I0PBK9nGeqeFkeH1bF1uGXkKpa0hGWffyOT1VasaZVXT -UN4VAYNzBwkoU0mIYK73CPi7e4YJrtOp/i8MGDL3pxKaZEEZJdc4/dZassqBuwSG -MRr2kecj9f53KWI0jLQdLgTMJQxscotfzhsWoF/842sUCbezwV3/4FtBhlNeqUHA -c9HOeh3wbjjt4uONvxeleE+jM9v63Q== -=gflA ------END PGP PUBLIC KEY BLOCK----- - -- cgit v1.2.3 From 94c96194a53b6a0c717fc287357bd8945ca3307e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 26 Apr 2019 18:57:49 +0200 Subject: Docker: remove comment to elimiate false positive during grep --- docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index c5e0b4d2..792a45de 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -183,7 +183,6 @@ RUN export RTRLIB_VERSION="0.6.3" && \ dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb # Packages needed to build frr itself -# libyang-dev packages are hsoted on dev.packages.vyos.net see # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst # for more info RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From 2657f076b4bc0e5bc1b989cfb4cb8e8204ecc36c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 23 May 2019 21:01:05 +0200 Subject: Docker: replace libmysqld-dev with libmariadb-dev for net-snmp --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index bfb56e50..733b16a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -274,7 +274,7 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ python-all \ python2.7-dev \ - libmysqld-dev + libmariadb-dev # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ -- cgit v1.2.3 From dee58b509635af77a832ed124390b9d1f332cb52 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Jul 2019 20:25:01 +0200 Subject: Docker: add pached debootstrap --- docker/Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'docker/Dockerfile') 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 -- cgit v1.2.3 From 7e14af718d2356a7c0d69acfb1994b965660fb30 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:49:30 +0200 Subject: Testsuite: Move needed packages to Dockerfile insted of in the Jenkins pipeline --- Jenkinsfile | 1 - docker/Dockerfile | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/Jenkinsfile b/Jenkinsfile index 01887914..fcf0dafd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,7 +120,6 @@ pipeline { stage('Test') { steps { sh """ - sudo apt-get update && sudo apt-get install -y python3-pexpect qemu-kvm cd build/ sudo ../scripts/check-qemu-install --debug live-image-amd64.hybrid.iso """ diff --git a/docker/Dockerfile b/docker/Dockerfile index 1052a8e8..799b118d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -280,6 +280,11 @@ RUN apt-get update && apt-get install -y \ python2.7-dev \ libmariadb-dev +# Packages needed for Qemu test-suite +RUN apt-get update && apt-get install -y \ + python3-pexpect \ + qemu-kvm + # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ jq -r -M '.current_version')"; \ -- cgit v1.2.3 From 9e5435a6ce462c8d1a6327a3ae48987190e4cec4 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 3 Oct 2019 10:43:27 -0500 Subject: T1710: [equuleus] buster: add patch to fix live-build missing key error --- docker/Dockerfile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 799b118d..d1da13b0 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 @@ -292,6 +293,20 @@ 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 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 # -- cgit v1.2.3 From 529220d610a6cf327b5543a5fd06fc819cded88f Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Mon, 28 Oct 2019 13:44:47 -0500 Subject: T1773: update Dockerfile for changes to libvyosconfig (cherry-pick from current bdce9244ff9acc57bf04a6c922cc78787aaa8174) --- docker/Dockerfile | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index dfb4a35a..6a09ae43 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -85,40 +85,24 @@ RUN apt-get update && apt-get install -y \ RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --output /tmp/opam_install.sh && \ sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \ - opam init --root=/opt/opam --comp=4.07.0 --disable-sandboxing - -RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam install -y \ - oasis + opam init --root=/opt/opam --comp=4.08.0 --disable-sandboxing RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - fileutils \ - lwt \ - lwt_ppx \ - lwt_log \ - ocplib-endian \ - ounit \ - pcre \ - ppx_deriving_yojson \ - sha \ - toml \ - xml-light \ - batteries \ - ocaml-protoc \ - ctypes-foreign \ - menhir + pcre RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - ctypes + ctypes \ + ctypes-foreign \ + ctypes-build # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyconf https://github.com/vyos/vyconf.git#51d79a3f -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#550048b3 -y # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 9a80a5d3 && \ + cd libvyosconfig && git checkout 5138b5eb && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -- cgit v1.2.3 From c3cbc7af476fb78d29e7cc9845749032a978c14f Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 8 Nov 2019 10:08:11 -0800 Subject: vyos-qat: adding pkg dependency (cherry picked from commit 263c2379eebca8161f0ab70ed55d0503beb1e913) --- docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docker/Dockerfile') diff --git a/docker/Dockerfile b/docker/Dockerfile index 6a09ae43..d4c9a627 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -157,6 +157,11 @@ RUN apt-get update && apt-get install -y \ cmake \ liblua5.2-dev +# Packages needed for vyos-qat +RUN apt-get update && apt-get install -y \ + libboost-dev \ + libudev-dev + # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html RUN apt-get update && apt-get install -y \ -- cgit v1.2.3