From 1f77d176055e11b1f47039afa7f8492b755ff02e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 15 Dec 2019 14:58:20 +0100 Subject: Docker: add retry options when fetching OPAM from GitHub --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 34733195..01075a7a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -96,7 +96,8 @@ RUN apt-get update && apt-get install -y \ libffi-dev \ libpcre3-dev -RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --output /tmp/opam_install.sh && \ +RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh \ + --output /tmp/opam_install.sh --retry 10 --retry-delay 5 && \ sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \ opam init --root=/opt/opam --comp=4.08.0 --disable-sandboxing -- cgit v1.2.3 From 1982adbcb7386cfb18ede22bea492d98cf503660 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 18 Dec 2019 14:04:11 +0100 Subject: Docker: switch Debian repository from current to crux --- docker/Dockerfile | 2 +- docker/Dockerfile-arm64 | 2 +- docker/Dockerfile-armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 01075a7a..7394434a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -195,7 +195,7 @@ RUN export RTRLIB_VERSION="0.6.3" && \ # 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" \ +RUN echo "deb http://dev.packages.vyos.net/repositories/crux/debian/ crux main" \ > /etc/apt/sources.list.d/vyos.list # Packages needed to build frr itself diff --git a/docker/Dockerfile-arm64 b/docker/Dockerfile-arm64 index 9625058b..f04a5806 100644 --- a/docker/Dockerfile-arm64 +++ b/docker/Dockerfile-arm64 @@ -209,7 +209,7 @@ RUN export RTRLIB_VERSION="0.6.3" && \ # 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" \ +RUN echo "deb http://dev.packages.vyos.net/repositories/crux/debian/ crux main" \ > /etc/apt/sources.list.d/vyos.list # Packages needed to build frr itself diff --git a/docker/Dockerfile-armhf b/docker/Dockerfile-armhf index 71b5b8bf..514b3acc 100644 --- a/docker/Dockerfile-armhf +++ b/docker/Dockerfile-armhf @@ -211,7 +211,7 @@ RUN export RTRLIB_VERSION="0.6.3" && \ # 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" \ +RUN echo "deb http://dev.packages.vyos.net/repositories/crux/debian/ crux main" \ > /etc/apt/sources.list.d/vyos.list # Packages needed to build frr itself -- cgit v1.2.3 From f2d457a9ed089995783207574699ec98c6956291 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 18 Dec 2019 20:10:31 +0100 Subject: Docker: build libyang from source --- docker/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 7394434a..2765fe47 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -173,7 +173,7 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyos-qat RUN apt-get update && apt-get install -y \ libboost-dev \ - libudev-dev + libudev-dev # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html @@ -198,13 +198,19 @@ RUN apt-key add /tmp/vyos-dev.key RUN echo "deb http://dev.packages.vyos.net/repositories/crux/debian/ crux main" \ > /etc/apt/sources.list.d/vyos.list +RUN export LIBYANG_COMMIT="179da47f2e8def1907372408a9df97a0dcbc1347" && \ + wget -P /tmp https://github.com/opensourcerouting/libyang/archive/${LIBYANG_COMMIT}.tar.gz && \ + tar xf /tmp/${LIBYANG_COMMIT}.tar.gz && \ + cd libyang-${LIBYANG_COMMIT} && \ + mkdir build && cd build && \ + cmake .. && make build-deb && \ + dpkg -i debs/*.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 \ - libyang-dev \ - libyang0.16 \ chrpath \ install-info \ libjson-c-dev \ -- cgit v1.2.3 From c90d376ecccf8bb0d8dcf3cfad2a86a32a0d095f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 18 Dec 2019 20:31:14 +0100 Subject: Revert "Docker: build libyang from source" This reverts commit f2d457a9ed089995783207574699ec98c6956291. --- docker/Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 2765fe47..7394434a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -173,7 +173,7 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyos-qat RUN apt-get update && apt-get install -y \ libboost-dev \ - libudev-dev + libudev-dev # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html @@ -198,19 +198,13 @@ RUN apt-key add /tmp/vyos-dev.key RUN echo "deb http://dev.packages.vyos.net/repositories/crux/debian/ crux main" \ > /etc/apt/sources.list.d/vyos.list -RUN export LIBYANG_COMMIT="179da47f2e8def1907372408a9df97a0dcbc1347" && \ - wget -P /tmp https://github.com/opensourcerouting/libyang/archive/${LIBYANG_COMMIT}.tar.gz && \ - tar xf /tmp/${LIBYANG_COMMIT}.tar.gz && \ - cd libyang-${LIBYANG_COMMIT} && \ - mkdir build && cd build && \ - cmake .. && make build-deb && \ - dpkg -i debs/*.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 \ + libyang-dev \ + libyang0.16 \ chrpath \ install-info \ libjson-c-dev \ -- cgit v1.2.3 From ae6653f13430f7e2af967650f662bba2d6ab2866 Mon Sep 17 00:00:00 2001 From: Jernej Jakob Date: Wed, 11 Dec 2019 20:17:56 +0100 Subject: T1892: docker: do not install recommended packages (cherry picked from commit 9266d923742d34375338ae11e2c7d7d8da23f106) --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 7394434a..a3da5342 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,6 +25,8 @@ ENV DEBIAN_FRONTEND noninteractive RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ dpkg-reconfigure dash +RUN echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends + RUN apt-get update && apt-get install -y \ dialog \ apt-utils \ @@ -37,15 +39,14 @@ RUN apt-get update && apt-get install -y \ vim \ git \ curl \ - make \ sudo \ mc \ + build-essential \ pbuilder \ devscripts \ squashfs-tools \ autoconf \ automake \ - dpkg-dev \ syslinux \ genisoimage \ lsb-release \ -- cgit v1.2.3 From b43b2d6036179a32c21ac931c9ff663070971c84 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 15:40:20 +0100 Subject: Docker: add missing python3-all dependency on StrongSwan (cherry picked from commit c1e3194d7a96fc183f6c1a88a6c701b62b5b55b0) --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index a3da5342..4ac9f562 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -277,6 +277,7 @@ RUN apt-get update && apt-get install -y \ dh-apparmor \ gperf \ libsystemd-dev \ + python3-all \ python3-stdeb \ python-setuptools -- cgit v1.2.3 From 997c94dce15f47373afdb865aa7b63d59f336868 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 17:25:57 +0100 Subject: Docker: add opam dependency on 'unzip' --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 4ac9f562..8ccc5bc3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -95,7 +95,8 @@ RUN rm -f /etc/apt/sources.list.d/jessie-backports.list \ # RUN apt-get update && apt-get install -y \ libffi-dev \ - libpcre3-dev + libpcre3-dev \ + unzip RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh \ --output /tmp/opam_install.sh --retry 10 --retry-delay 5 && \ -- cgit v1.2.3 From 296ed2e86831d43a3f13cd19fe202f73688857de Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 17:49:28 +0100 Subject: Docker: add pmacct dependency on 'libssl-dev' --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 8ccc5bc3..cf3246ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -145,6 +145,7 @@ RUN apt-get update && apt-get install -y \ # Packages needed for pmacct RUN apt-get update && apt-get install -y \ libpcap-dev \ + libssl-dev \ libpq-dev \ libmysqlclient-dev \ libgeoip-dev \ @@ -175,7 +176,7 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyos-qat RUN apt-get update && apt-get install -y \ libboost-dev \ - libudev-dev + libudev-dev # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html -- cgit v1.2.3 From 84d73efa0e1d8aa58c0e9b8e81503ed2eb6feae8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 17:55:02 +0100 Subject: Docker: add libssl packages to base image --- docker/Dockerfile | 2 ++ packages/vyatta-bash | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index cf3246ea..b0337bde 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,6 +66,8 @@ RUN apt-get update && apt-get install -y \ python3-pystache \ pkg-config \ debhelper \ + libssl-dev \ + libssl1.0.0 \ jq # diff --git a/packages/vyatta-bash b/packages/vyatta-bash index 001f9b1a..f69d4c99 160000 --- a/packages/vyatta-bash +++ b/packages/vyatta-bash @@ -1 +1 @@ -Subproject commit 001f9b1a9bd2b307bca94510ce05bc067e34f84d +Subproject commit f69d4c9913897fd257bba34314f83b270249035c -- cgit v1.2.3 From 8430f2f52ceea212a8c86720a7d3f396cb802d9f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 19:36:29 +0100 Subject: Docker: consolidate dependencies for Kernel --- docker/Dockerfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index b0337bde..0e533b93 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -156,21 +156,15 @@ RUN apt-get update && apt-get install -y \ librdkafka-dev \ libnetfilter-log-dev -# Pavkages needed for wireguard -RUN apt-get update && apt-get install -y \ - libmnl-dev - # Packages needed for kernel RUN apt-get update && apt-get install -y \ + libmnl-dev \ kernel-package \ libncurses5-dev \ flex \ bison \ libelf-dev \ - dkms - -# Packages needed for Accel-ppp -RUN apt-get update && apt-get install -y \ + dkms \ cdbs \ cmake \ liblua5.2-dev -- cgit v1.2.3 From 87de73ef07f350c8c69204eb68ad8b527ffca452 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 19:56:54 +0100 Subject: Docker: vyos-1x depends on fakeroot (cherry picked from commit f697e3deb9d5d8d7f5479448ac63a66e50a7ea95) --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 0e533b93..021b6534 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -231,6 +231,7 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyos-1x RUN apt-get update && apt-get install -y \ + fakeroot \ whois # Packages needed for vyos-xe-guest-utilities -- cgit v1.2.3 From f24ee316fd4b38a23bfba7dbf854e7d3055da1ec Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 20 Dec 2019 15:33:33 +0100 Subject: Docker: add missing openssh-client dependency After commit 9266d92 ("T1892: docker: do not install recommended packages") ssh client binary is missing. (cherry picked from commit 9af4bee638793f42e710085034b1a8ff35c8a817) --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 021b6534..00e8aba0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -68,6 +68,7 @@ RUN apt-get update && apt-get install -y \ debhelper \ libssl-dev \ libssl1.0.0 \ + openssh-client \ jq # -- cgit v1.2.3 From 093a91188b3a64fcfa29645546b69bbf8f7df465 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 27 Dec 2019 14:19:27 +0100 Subject: Docker: extend dependencies on vyatta-cfg (cherry picked from commit 76e71a9b2f2797db1d57eac37c61ab845217186c) --- docker/Dockerfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 00e8aba0..5de0e2b5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -127,9 +127,19 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Packages needed for vyatta-cfg RUN apt-get update && apt-get install -y \ + autotools-dev \ libglib2.0-dev \ + libboost-filesystem-dev \ + libapt-pkg-dev \ + libtool \ + flex \ + bison \ libperl-dev \ - libboost-filesystem-dev + autoconf \ + automake \ + pkg-config \ + cpio + # Packages needed for vyatta-iproute RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From f1e81cf260f9e740f760e6e3d6ca67462a5cd7c1 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 27 Dec 2019 14:19:37 +0100 Subject: Docker: extend dependencies on vyatta-cfg-firewall (cherry picked from commit b3fec81c11321104950668ea1e928fd26d0eba78) --- docker/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 5de0e2b5..9ff9281e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -140,6 +140,12 @@ RUN apt-get update && apt-get install -y \ pkg-config \ cpio +# Packages needed for vyatta-cfg-firewall +RUN apt-get update && apt-get install -y \ + autotools-dev \ + autoconf \ + automake \ + cpio # Packages needed for vyatta-iproute RUN apt-get update && apt-get install -y \ -- cgit v1.2.3