From 026db7258233182ae1f04a553e184b0484a62df6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 27 Jan 2019 19:43:01 +0100 Subject: Docker: update to latest libvyosconfig revision --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index bca48ff8..36efdfef 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -230,7 +230,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig && \ cd libvyosconfig && \ - git checkout v0.0.4 && \ + git checkout a9817fa26c1be1 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -- cgit v1.2.3 From 9df5e15e9939dea7e5ecc944661d0ecb8eb0ccf4 Mon Sep 17 00:00:00 2001 From: Nicholas Humfrey Date: Tue, 29 Jan 2019 23:12:00 +0000 Subject: T1202: Add `hvinfo` to the packages directory (#43) --- .gitmodules | 6 +++++- docker/Dockerfile | 5 +++++ packages/hvinfo | 1 + scripts/build-submodules | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 160000 packages/hvinfo (limited to 'docker') diff --git a/.gitmodules b/.gitmodules index 22bb87d5..8be1f363 100644 --- a/.gitmodules +++ b/.gitmodules @@ -236,4 +236,8 @@ [submodule "packages/igmpproxy"] path = packages/igmpproxy url = https://github.com/vyos/igmpproxy.git - branch = current \ No newline at end of file + branch = current +[submodule "packages/hvinfo"] + path = packages/hvinfo + url = https://github.com/dmbaturin/hvinfo.git + branch = master diff --git a/docker/Dockerfile b/docker/Dockerfile index bca48ff8..889652f3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -234,6 +234,11 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb +# Packages needed for hvinfo +RUN apt-get update && apt-get install -y \ + gnat \ + gprbuild + # Packages needed for vyos-1x RUN apt-get update && apt-get install -y \ whois diff --git a/packages/hvinfo b/packages/hvinfo new file mode 160000 index 00000000..6d15dff8 --- /dev/null +++ b/packages/hvinfo @@ -0,0 +1 @@ +Subproject commit 6d15dff8eb5418a23035d18078f367bc799b702c diff --git a/scripts/build-submodules b/scripts/build-submodules index 0d11c059..11d386fd 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -198,6 +198,7 @@ for PKG in mdns-repeater \ eventwatchd \ ddclient \ rtrlib \ + hvinfo \ igmpproxy \ libvyosconfig \ vyatta-bash \ -- cgit v1.2.3 From 9779f9938e1a80736738b2b9021a0db4dd872bfa Mon Sep 17 00:00:00 2001 From: Nicholas Humfrey Date: Wed, 30 Jan 2019 10:04:31 +0000 Subject: T1214: Add `ipaddrcheck` to the packages directory --- .gitmodules | 4 ++++ docker/Dockerfile | 6 ++++++ packages/ipaddrcheck | 1 + scripts/build-submodules | 1 + 4 files changed, 12 insertions(+) create mode 160000 packages/ipaddrcheck (limited to 'docker') diff --git a/.gitmodules b/.gitmodules index 2257b9f1..dd608357 100644 --- a/.gitmodules +++ b/.gitmodules @@ -245,3 +245,7 @@ path = packages/libyang url = https://github.com/opensourcerouting/libyang.git branch = debian +[submodule "packages/ipaddrcheck"] + path = packages/ipaddrcheck + url = https://github.com/vyos/ipaddrcheck.git + branch = master diff --git a/docker/Dockerfile b/docker/Dockerfile index 13919ede..38dea015 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -234,6 +234,12 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb +# Packages needed for ipaddrcheck +RUN apt-get update && apt-get install -y \ + libpcre3-dev \ + libcidr-dev \ + check + # Packages needed for hvinfo RUN apt-get update && apt-get install -y \ gnat \ diff --git a/packages/ipaddrcheck b/packages/ipaddrcheck new file mode 160000 index 00000000..8f0d655c --- /dev/null +++ b/packages/ipaddrcheck @@ -0,0 +1 @@ +Subproject commit 8f0d655cc68995a0ef88dc905dc62db2af23ec90 diff --git a/scripts/build-submodules b/scripts/build-submodules index a167b6e0..ae0c1c09 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -260,6 +260,7 @@ for PKG in mdns-repeater \ rtrlib \ hvinfo \ igmpproxy \ + ipaddrcheck \ libvyosconfig \ vyatta-bash \ vyatta-biosdevname \ -- cgit v1.2.3 From 78d69b0c252ba82da6bd4dbcbe50037052d58668 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 30 Jan 2019 22:04:59 +0100 Subject: Revert "T1214: Add `ipaddrcheck` to the packages directory" libcidr-dev is not available until Debian Buster thus the container can't be build. This reverts commit 9779f9938e1a80736738b2b9021a0db4dd872bfa. --- .gitmodules | 4 ---- docker/Dockerfile | 6 ------ packages/ipaddrcheck | 1 - scripts/build-submodules | 1 - 4 files changed, 12 deletions(-) delete mode 160000 packages/ipaddrcheck (limited to 'docker') diff --git a/.gitmodules b/.gitmodules index dd608357..2257b9f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -245,7 +245,3 @@ path = packages/libyang url = https://github.com/opensourcerouting/libyang.git branch = debian -[submodule "packages/ipaddrcheck"] - path = packages/ipaddrcheck - url = https://github.com/vyos/ipaddrcheck.git - branch = master diff --git a/docker/Dockerfile b/docker/Dockerfile index 38dea015..13919ede 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -234,12 +234,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -# Packages needed for ipaddrcheck -RUN apt-get update && apt-get install -y \ - libpcre3-dev \ - libcidr-dev \ - check - # Packages needed for hvinfo RUN apt-get update && apt-get install -y \ gnat \ diff --git a/packages/ipaddrcheck b/packages/ipaddrcheck deleted file mode 160000 index 8f0d655c..00000000 --- a/packages/ipaddrcheck +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f0d655cc68995a0ef88dc905dc62db2af23ec90 diff --git a/scripts/build-submodules b/scripts/build-submodules index f3ab6cf7..af992649 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -260,7 +260,6 @@ for PKG in mdns-repeater \ rtrlib \ hvinfo \ igmpproxy \ - ipaddrcheck \ libvyosconfig \ vyatta-bash \ vyatta-biosdevname \ -- cgit v1.2.3 From 9467da7d1471cdeeb0272ae619f2a323408726df Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 31 Jan 2019 18:52:51 +0100 Subject: Docker: fix libvyosconfig repo URL --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 13919ede..d3d012f3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -228,7 +228,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - git clone https://github.com/vyos/libvyosconfig && \ + git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && \ git checkout a9817fa26c1be1 && \ dpkg-buildpackage -uc -us -tc -b && \ -- cgit v1.2.3 From d34540adfdbbbc9abc330ebc504fc1cd5f40387f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 31 Jan 2019 18:53:05 +0100 Subject: Docker: build libcidr fro source --- docker/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index d3d012f3..cfb5d592 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -247,6 +247,13 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ golang +# Packages needed for ipaddrcheck +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 + # 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 && \ -- cgit v1.2.3 From 61ea43e901167584d6e137ad7eed3badb9f070f7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 31 Jan 2019 22:20:25 +0100 Subject: Docker: add missing dependency for ipaddrcheck --- docker/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index cfb5d592..8676657e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -248,6 +248,10 @@ RUN apt-get update && apt-get install -y \ golang # Packages needed for ipaddrcheck +RUN apt-get update && apt-get install -y \ + 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 && \ -- cgit v1.2.3 From 82e47dc6150c83e27dbe0b5d3b76a6fe7fa1dd5e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 1 Feb 2019 19:43:41 +0100 Subject: Docker: build dependencies for lldpd and pdns-recursor added --- docker/Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 8676657e..0b03a8e5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -258,6 +258,24 @@ RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libcidr*.deb +# Packages needed for lldpd +RUN apt-get update && apt-get install -y \ + libbsd-dev \ + libevent-dev + +# Packages needed for pdns-recursor +RUN apt-get update && apt-get install -y \ + libboost-context-dev \ + libboost-dev \ + libboost-program-options-dev \ + libboost-test-dev \ + liblua5.2-dev \ + libprotobuf-dev \ + libsodium-dev \ + protobuf-compiler \ + publicsuffix \ + ragel + # 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 && \ -- cgit v1.2.3 From 8f43e05f7e9d594579ecd716e34856191991e894 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 16 Feb 2019 15:26:38 +0100 Subject: Docker: update to latest version of VyConf an libvyosconfig --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 0b03a8e5..4e0efa80 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -224,13 +224,13 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # 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#v0.1 -y + opam pin add vyconf https://github.com/vyos/vyconf.git#51d79a3f3e08 -y # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && \ - git checkout a9817fa26c1be1 && \ + git checkout 6b7b7ed091900399 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb -- cgit v1.2.3 From d292573e963e57ac605d7299fc7f8aa907b8000b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 28 Mar 2019 22:45:09 +0100 Subject: Docker: Container Update for jessie-backports jesie-backports moved to Debian Archive as this train is no longer actively maintained. In addition to the mirror change also improve the build dependency handling. --- docker/Dockerfile | 147 +++++++++++++++++++++++-------------------- docker/no--check-valid-until | 1 + docker/sources.list | 3 + 3 files changed, 82 insertions(+), 69 deletions(-) create mode 100644 docker/no--check-valid-until create mode 100644 docker/sources.list (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 4e0efa80..46df8e4c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,10 +1,29 @@ -# Must be run with --privileged flag -# Recommended to run the container with a volume mapped +# Copyright (C) 2018 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify # in order to easy exprort images built to "external" world +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Must be run with --privileged flag, recommended to run the container with a +# volume mapped in order to easy export images + FROM debian:jessie +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/ + # Standard shell should be bash not dash RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ dpkg-reconfigure dash @@ -24,7 +43,6 @@ RUN apt-get update && apt-get install -y \ make \ sudo \ mc \ - live-build \ pbuilder \ devscripts \ python3-pystache \ @@ -56,35 +74,18 @@ RUN apt-get update && apt-get install -y \ python3-setuptools \ python3-nose \ python3-coverage \ - python3-sphinx - -# Add Debian jessie-backports support -RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' | tee -a /etc/apt/sources.list && \ - apt-get update && apt-get install -y -t jessie-backports \ - python3-git \ - gosu - -# Packages needed for building vyos-strongswan -RUN apt-get update && apt-get install -y -t jessie-backports debhelper && \ - apt-get install -y \ + python3-sphinx \ + python3-pystache \ dh-apparmor \ gperf \ - iptables-dev \ - libcap-dev \ - libgcrypt20-dev \ - libgmp3-dev \ - libldap2-dev \ - libpam0g-dev \ libsystemd-dev \ - libgmp-dev \ - iptables \ - xl2tpd \ - libcurl4-openssl-dev \ - libkrb5-dev \ - libsqlite3-dev \ - libssl-dev \ - libxml2-dev \ - pkg-config + pkg-config \ + debhelper + +RUN apt-get update && apt-get install -y -t jessie-backports \ + python3-git \ + python3-pip \ + gosu # Package needed for mdns-repeater RUN apt-get update && apt-get install -y -t jessie-backports \ @@ -97,7 +98,8 @@ RUN apt-get update &&apt-get install -y \ # Packages needed for vyatta-iproute RUN apt-get update && apt-get install -y \ libatm1-dev \ - libdb-dev + libdb-dev \ + iptables-dev # Packages needed for vyatta-webgui RUN apt-get update && apt-get install -y \ @@ -115,13 +117,6 @@ RUN apt-get update && apt-get install -y \ librdkafka-dev \ libnetfilter-log-dev -# Packages needed for vyos-keepalived -RUN apt-get update && apt-get install -y \ - libnl-3-dev \ - libnl-genl-3-dev \ - libpopt-dev \ - libsnmp-dev - # Pavkages needed for wireguard RUN apt-get update && apt-get install -y \ libmnl-dev @@ -136,11 +131,12 @@ RUN apt-get update && apt-get install -y \ cmake \ liblua5.1-dev -# Prerequisites for building FRR from source +# 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 \ doxygen \ - libssh-dev + libssh-dev \ + libssl-dev RUN export RTRLIB_COMMIT="v0.6.3" && \ git clone https://github.com/rtrlib/rtrlib.git && \ @@ -161,26 +157,15 @@ RUN export LIBYANG_COMMIT="179da47f2e8de" && \ cmake .. && make build-deb && \ dpkg -i debs/*.deb -# Packages needed for frr +# Packages needed to build frr itself RUN apt-get update && apt-get install -y \ - libreadline-dev \ - texinfo \ - pkg-config \ - imagemagick \ - groff \ - hardening-wrapper \ - gawk \ chrpath \ - libjson0 \ - libjson0-dev \ - python-ipaddr \ + install-info \ + libjson-c-dev \ + libpython3-dev \ python3-dev \ python3-pytest \ - install-info \ - libc-ares-dev \ - libc-ares2 \ - libzmq3 \ - libzmq3-dev + texinfo # Packages needed for conntrack-tools RUN apt-get update && apt-get install -y \ @@ -224,13 +209,12 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # 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#51d79a3f3e08 -y + opam pin add vyconf https://github.com/vyos/vyconf.git#51d79a3f -y # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && \ - git checkout 6b7b7ed091900399 && \ + cd libvyosconfig && git checkout 9a80a5d3 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb @@ -263,18 +247,40 @@ RUN apt-get update && apt-get install -y \ libbsd-dev \ libevent-dev -# Packages needed for pdns-recursor +# Packages needed for vyatta-quagga RUN apt-get update && apt-get install -y \ - libboost-context-dev \ - libboost-dev \ - libboost-program-options-dev \ - libboost-test-dev \ - liblua5.2-dev \ - libprotobuf-dev \ - libsodium-dev \ - protobuf-compiler \ - publicsuffix \ - ragel + libpam-dev \ + libcap-dev \ + libsnmp-dev \ + gawk + +# Packages needed for vyos-strongswan +RUN apt-get update && apt-get install -y \ + libkrb5-dev \ + libssl-dev \ + libxml2-dev \ + systemd \ + libcurl4-openssl-dev \ + libgcrypt20-dev \ + libgmp3-dev \ + libldap2-dev \ + libsqlite3-dev + +# Packages needed for vyos-opennhrp +RUN apt-get update && apt-get install -y \ + libc-ares-dev + +# Packages needed for ddclient +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/* # Update live-build RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \ @@ -297,5 +303,8 @@ RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ # Ensure sure all users have access to our OCAM installation RUN echo "$(opam env --root=/opt/opam --set-root)" >> /etc/skel/.bashrc +# Cleanup +RUN rm -rf /tmp/* + COPY entrypoint.sh /usr/local/bin/entrypoint.sh ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/docker/no--check-valid-until b/docker/no--check-valid-until new file mode 100644 index 00000000..27ed79f3 --- /dev/null +++ b/docker/no--check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until "0"; diff --git a/docker/sources.list b/docker/sources.list new file mode 100644 index 00000000..9d0fa506 --- /dev/null +++ b/docker/sources.list @@ -0,0 +1,3 @@ +deb http://deb.debian.org/debian/ jessie main +deb http://deb.debian.org/debian-security/ jessie/updates main +deb http://archive.debian.org/debian/ jessie-backports main -- cgit v1.2.3