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 ++++++++------------------------------ docker/no--check-valid-until | 1 - docker/sources.list | 4 ---- 3 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 docker/no--check-valid-until delete mode 100644 docker/sources.list 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 diff --git a/docker/no--check-valid-until b/docker/no--check-valid-until deleted file mode 100644 index 27ed79f3..00000000 --- a/docker/no--check-valid-until +++ /dev/null @@ -1 +0,0 @@ -Acquire::Check-Valid-Until "0"; diff --git a/docker/sources.list b/docker/sources.list deleted file mode 100644 index ec827988..00000000 --- a/docker/sources.list +++ /dev/null @@ -1,4 +0,0 @@ -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 -deb http://dev.packages.vyos.net/repositories/current/debian/ current main -- cgit v1.2.3 From 7492e273834b4aa01712b16d8229fd9f91019c89 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 25 Apr 2019 16:18:14 +0200 Subject: VyOS 1.3.0 is based on Debian Buster --- data/defaults.json | 8 ++------ data/versions | 2 +- scripts/live-build-config | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/data/defaults.json b/data/defaults.json index 2699b789..bddc75f1 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -2,15 +2,11 @@ "architecture": "amd64", "debian_mirror": "http://deb.debian.org/debian", "debian_security_mirror": "http://deb.debian.org/debian-security", - "debian_distribution": "jessie", + "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", "kernel_version": "4.19.36", "kernel_flavor": "amd64-vyos", - "additional_repositories": [ - "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main", - "deb http://repo.powerdns.com/debian jessie-rec-41 main", - "deb http://archive.debian.org/debian/ jessie-backports main" - ], + "additional_repositories": [], "custom_packages": [] } diff --git a/data/versions b/data/versions index 3d0c2871..6b068aa7 100644 --- a/data/versions +++ b/data/versions @@ -1,3 +1,3 @@ { - "current": "1.2.0" + "current": "1.3.0" } diff --git a/scripts/live-build-config b/scripts/live-build-config index 9b7c2d67..05a41bd4 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -45,7 +45,7 @@ lb config noauto \ --iso-application "VyOS" \ --iso-publisher "{{build_by}}" \ --iso-volume "VyOS" \ - --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-transport-https" \ + --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-transport-https,gnupg2" \ --mirror-bootstrap {{debian_mirror}} \ --mirror-chroot {{debian_mirror}} \ --mirror-chroot-security {{debian_security_mirror}} \ @@ -54,9 +54,8 @@ lb config noauto \ --archive-areas "main contrib non-free" \ --firmware-chroot false \ --firmware-binary false \ - --updates false \ + --updates true \ --security true \ - --apt-options "--yes -oAcquire::Check-Valid-Until=false" \ --apt-indices false "${@}" """ -- 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(-) 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(-) 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(-) 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 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 b65c43cd718f1775990c9ca70647e8b0360e4728 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 26 Apr 2019 18:49:11 +0200 Subject: Build: use proper versions depnding on Git branches --- data/versions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/versions b/data/versions index 6b068aa7..868d21cb 100644 --- a/data/versions +++ b/data/versions @@ -1,3 +1,4 @@ { - "current": "1.3.0" + "buster": "1.3.0", + "current": "1.2.0" } -- 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(-) 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 7965820b8581989e88120efc689f52bf703dccc0 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:53:19 +0200 Subject: Utils: replace netcat(6) with netcat-openbsd Debian Buster does no longer provide packages like netcat and netcat6 --- data/live-build-config/package-lists/vyos-utils.list.chroot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot index cc28e9b7..8c0a8cd4 100644 --- a/data/live-build-config/package-lists/vyos-utils.list.chroot +++ b/data/live-build-config/package-lists/vyos-utils.list.chroot @@ -4,8 +4,7 @@ ipcalc sipcalc mtr-tiny whois -netcat -netcat6 +netcat-openbsd socat telnet nano -- cgit v1.2.3 From 5eca417ff33caefd752ae9fff20ff0581fa6f918 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:56:15 +0200 Subject: Build: use VyOS version 1.3 for branch equuleus --- data/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/versions b/data/versions index 868d21cb..5cbb0ad3 100644 --- a/data/versions +++ b/data/versions @@ -1,4 +1,4 @@ { - "buster": "1.3.0", + "equuleus": "1.3.0", "current": "1.2.0" } -- cgit v1.2.3 From 0df7365a73596261a1136e6142e6b918a037ec81 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:57:14 +0200 Subject: Packages: favour Debian Buster version of 'xl2tpd' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index cff676ed..372acb3c 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -184,7 +184,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-biosdevname', 'vyos-opennhrp', 'vyos-salt-minion', - 'xl2tpd', 'mdns-repeater', 'udp-broadcast-relay', 'pmacct', -- cgit v1.2.3 From 1ae054ecfc4521235c5b912864d430a33a5f3238 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:57:44 +0200 Subject: Packages: favour Debian Buster version of 'igmpproxy' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 372acb3c..c38d331d 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -188,7 +188,6 @@ vyos_packages = ['vyatta-bash', 'udp-broadcast-relay', 'pmacct', 'ddclient', - 'igmpproxy', 'eventwatchd', 'conntrack-tools'] -- cgit v1.2.3 From 9679c120c18e5681084d80011aa4882037bc824c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:58:13 +0200 Subject: Packages: favour Debian Buster version of 'pmacct' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index c38d331d..f8220689 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -186,7 +186,6 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', - 'pmacct', 'ddclient', 'eventwatchd', 'conntrack-tools'] -- cgit v1.2.3 From 6455ecb9fdf07a0d559592a0f6cdfe88198cb3b5 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:58:31 +0200 Subject: Packages: favour Debian Buster version of 'ddclient' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index f8220689..9378ea85 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -186,7 +186,6 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', - 'ddclient', 'eventwatchd', 'conntrack-tools'] -- cgit v1.2.3 From 21e6775dbc86f6025e42677d105c788eddaeb1d7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:59:36 +0200 Subject: Packages: favour Debian Buster version of 'lldpd' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 9378ea85..22565e62 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -201,7 +201,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -pkg_special.append( add_package('lldpd', url='https://github.com/vincentbernat/lldpd.git', branch='master', tag='1.0.3') ) pkg_special.append( add_package('ethtool', url='https://salsa.debian.org/kernel-team/ethtool.git', branch='master', tag='debian/1%4.19-1') ) pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') ) -- cgit v1.2.3 From 86670e60bf70a6640e7a610baa4469ab74afc83a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 1 May 2019 23:59:53 +0200 Subject: Packages: favour Debian Buster version of 'ethtool' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 22565e62..864e7da9 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -201,7 +201,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -pkg_special.append( add_package('ethtool', url='https://salsa.debian.org/kernel-team/ethtool.git', branch='master', tag='debian/1%4.19-1') ) pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') ) # VyOS strongswan ships additional python3-vici packages required by vyos-1x and this is not build by default -- cgit v1.2.3 From 7f0cd5969988f10bd6dbfd64ed066966722578a6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:00:09 +0200 Subject: Packages: favour Debian Buster version of 'bgpq3' --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 864e7da9..55f8b369 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -201,7 +201,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') ) # VyOS strongswan ships additional python3-vici packages required by vyos-1x and this is not build by default vyos_strongswan_build_cmd = "dpkg-buildpackage -b -us -uc -tc && " \ -- cgit v1.2.3 From 15de1a9b8d4f57d05d9848b8fa8cc96dd061b77e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:01:18 +0200 Subject: Packages: use 'equuleus' branch of 'vyos-1x' --- scripts/build-packages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 55f8b369..8a6fb46d 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -176,7 +176,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-ravpn', 'vyos-nhrp', 'vyos-world', - 'vyos-1x', 'vyatta-iproute', 'vyos-vmwaretools-scripts', 'vyos-netplug', @@ -198,6 +197,7 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \ "dpkg-buildpackage -b -us -uc -tc" pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd)) pkg_special.append( add_package('ipaddrcheck', branch='master')) +pkg_special.append( add_package('vyos-1x', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From 8a2922799c50764744f1c0be1548afb5b73a5f94 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:08:55 +0200 Subject: Packages: use 'equuleus' branch for 'vyatta-conntrack*' --- scripts/build-packages | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/build-packages b/scripts/build-packages index 8a6fb46d..a0e329b7 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -155,8 +155,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-op-qos', 'vyatta-cfg-op-pppoe', 'vyatta-openvpn', - 'vyatta-conntrack', - 'vyatta-conntrack-sync', 'vyatta-nat', 'vyatta-config-mgmt', 'vyatta-config-migrate', @@ -185,8 +183,7 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', - 'eventwatchd', - 'conntrack-tools'] + 'eventwatchd'] # Special packages mean packages which are located no in the VyOS namespace # or require fancy build instructions @@ -198,6 +195,8 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \ pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd)) pkg_special.append( add_package('ipaddrcheck', branch='master')) pkg_special.append( add_package('vyos-1x', branch='equuleus')) +pkg_special.append( add_package('vyatta-conntrack', branch='equuleus')) +pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From b889549e517953a8ce208389d5b485dadd1af387 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 2 May 2019 00:09:01 +0200 Subject: intel: remove dependency on linux-image --- scripts/build-intel-drivers | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/build-intel-drivers b/scripts/build-intel-drivers index ef039e4c..2c5882bb 100755 --- a/scripts/build-intel-drivers +++ b/scripts/build-intel-drivers @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash basedir=$(pwd) if [ -z "$KSRC" ]; then @@ -67,7 +67,6 @@ do echo "Architecture: amd64" >>$deb_pkg_dir/DEBIAN/control echo "Maintainer: VyOS Package Maintainers " >>$deb_pkg_dir/DEBIAN/control echo "Installed-Size: 9" >>$deb_pkg_dir/DEBIAN/control - echo "Depends: linux-image" >>$deb_pkg_dir/DEBIAN/control echo "Description: Intel Vendor driver for $dirname" >>$deb_pkg_dir/DEBIAN/control echo " Replacement for the in Kernel drivers" >>$deb_pkg_dir/DEBIAN/control -- 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(-) 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 4294fd325008b8024a477664b5c993ac9c89eb6e Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 22:36:33 +0200 Subject: T1412, T1413: remove non installable paclage vyos-xe-guest-utilities and vyos-netplug These packages is for now not installable in buster and breaks the live-build process --- data/package-lists/vyos-x86.list.chroot | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index 6f5d7624..e107534c 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -2,5 +2,3 @@ grub2 grub-pc qemu-guest-agent hyperv-daemons -vyos-xe-guest-utilities -vyos-netplug -- cgit v1.2.3 From 1850f165abda3f3d0498220e56ca594dc8ecca9c Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 22:51:06 +0200 Subject: T1414: disable failing 10-unmountfs.chroot and needs verification --- data/live-build-config/hooks/live/10-unmountfs.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/live-build-config/hooks/live/10-unmountfs.chroot b/data/live-build-config/hooks/live/10-unmountfs.chroot index 7992a4d2..05bcc12c 100755 --- a/data/live-build-config/hooks/live/10-unmountfs.chroot +++ b/data/live-build-config/hooks/live/10-unmountfs.chroot @@ -1,5 +1,5 @@ #!/bin/sh - +exit 0 # hack umountfs script to cleanly unmount live systems sed \ -- cgit v1.2.3 From 1109c04fec9a201d3cb321ab5eb4d5b496eac540 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 22:57:46 +0200 Subject: T1415: disable 24-efi_packages.chroot as it fails apply'ing by live-build The package grub-efi and grub-efi-amd64 is not existant on buster --- data/live-build-config/hooks/live/24-efi_packages.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/live-build-config/hooks/live/24-efi_packages.chroot b/data/live-build-config/hooks/live/24-efi_packages.chroot index c2b1ff11..49bc6ebb 100755 --- a/data/live-build-config/hooks/live/24-efi_packages.chroot +++ b/data/live-build-config/hooks/live/24-efi_packages.chroot @@ -1,5 +1,5 @@ #!/bin/sh - +exit 0 echo I: Download grub-efi packages. mkdir -p /usr/share/vyos/packages -- cgit v1.2.3 From e9d561ad537ebaa0d5eba5e6413ee1428141bf4a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Tue, 28 May 2019 23:01:55 +0200 Subject: Update kernel arguments, enable isolinux serial and disable systemd ifnames * The kernel is now sending console to ttyS0, this makes debugging with `qemu -nographic` hard, this is fixed by this commit * Buster activates systemd ifname'ing, this needs to be disabled to make our naming scheme work --- scripts/live-build-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/live-build-config b/scripts/live-build-config index 05a41bd4..7141df00 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -35,7 +35,7 @@ util.check_build_config() lb_config_tmpl = """ lb config noauto \ --architectures {{architecture}} \ - --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay" \ + --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" \ --linux-flavours {{kernel_flavor}} \ --linux-packages linux-image-{{kernel_version}} \ --bootloader syslinux,grub-efi \ -- cgit v1.2.3 From 3da6afd6a521ee1d55607a4a015be1696ea9ff0a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Thu, 20 Jun 2019 09:39:35 +0200 Subject: T1413: T1412: compilation of netplug and xe-guest-utilities is now fixed in equuleus --- data/package-lists/vyos-x86.list.chroot | 2 ++ scripts/build-packages | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index e107534c..8e2b8692 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -2,3 +2,5 @@ grub2 grub-pc qemu-guest-agent hyperv-daemons +vyos-netplug +vyos-xe-guest-utilities diff --git a/scripts/build-packages b/scripts/build-packages index 2d33708f..9d94ca12 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -177,8 +177,6 @@ vyos_packages = ['vyatta-bash', 'vyos-world', 'vyatta-iproute', 'vyos-vmwaretools-scripts', - 'vyos-netplug', - 'vyos-xe-guest-utilities', 'vyatta-biosdevname', 'vyos-opennhrp', 'vyos-salt-minion', @@ -198,6 +196,8 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) pkg_special.append( add_package('vyos-1x', branch='equuleus')) pkg_special.append( add_package('vyatta-conntrack', branch='equuleus')) pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus')) +pkg_special.append( add_package('vyos-xe-guest-utilities', branch='equuleus')) +pkg_special.append( add_package('vyos-netplug', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- 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(+) 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 7ac3f58540df9749ec71a2fd17d4f4c8257ff801 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Jul 2019 20:30:40 +0200 Subject: Packages: default to equuleus branch --- scripts/build-packages | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/build-packages b/scripts/build-packages index 9d94ca12..d694b8bb 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -11,7 +11,7 @@ current_working_directory = os.getcwd() repo_root = subprocess.check_output('git rev-parse --show-toplevel', shell=True, universal_newlines=True).rstrip('\n') repo_sha = subprocess.check_output('git rev-parse --short=12 HEAD', shell=True, universal_newlines=True).rstrip('\n') -def add_package(name, url=None, commit='HEAD', branch='current', tag=None, custombuild_cmd=None): +def add_package(name, url=None, commit='HEAD', branch='equuleus', tag=None, custombuild_cmd=None): """ Build up source package with URL and build commands executed during the later called build_package step. @@ -182,6 +182,11 @@ vyos_packages = ['vyatta-bash', 'vyos-salt-minion', 'mdns-repeater', 'udp-broadcast-relay', + 'vyos-1x', + 'vyatta-conntrack', + 'vyatta-conntrack-sync', + 'vyos-xe-guest-utilities', + 'vyos-netplug', 'eventwatchd'] # Special packages mean packages which are located no in the VyOS namespace @@ -193,11 +198,6 @@ libvyosconfig_build_cmd = "eval $(opam env --root=/opt/opam --set-root) && " \ "dpkg-buildpackage -b -us -uc -tc" pkg_special.append( add_package('libvyosconfig', branch='master', custombuild_cmd=libvyosconfig_build_cmd)) pkg_special.append( add_package('ipaddrcheck', branch='master')) -pkg_special.append( add_package('vyos-1x', branch='equuleus')) -pkg_special.append( add_package('vyatta-conntrack', branch='equuleus')) -pkg_special.append( add_package('vyatta-conntrack-sync', branch='equuleus')) -pkg_special.append( add_package('vyos-xe-guest-utilities', branch='equuleus')) -pkg_special.append( add_package('vyos-netplug', branch='equuleus')) # Packages where we directly build the upstream source pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) -- cgit v1.2.3 From b229f0bd958a42c6faa345c91500c2ed8ccdc919 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 20 Jul 2019 21:20:30 +0200 Subject: Packages: remove vyatta-op-dhcp-server --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index d694b8bb..c57dd822 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -164,7 +164,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-webproxy', 'vyatta-cfg-quagga', 'vyatta-op-quagga', - 'vyatta-op-dhcp-server', 'vyatta-wireless', 'vyatta-wirelessmodem', 'vyatta-wanloadbalance', -- cgit v1.2.3 From 3c9071dcc1ed48cbbcae26d967eaef8763210482 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Tue, 30 Jul 2019 09:03:37 -0400 Subject: Adjustments for the new equuleus repository. --- data/defaults.json | 4 +- .../live-build-config/archives/vyos-dev.key.chroot | 77 +++++++++++------ .../archives/vyos-release.key.chroot | 99 +++++++++++----------- scripts/live-build-config | 5 +- 4 files changed, 102 insertions(+), 83 deletions(-) diff --git a/data/defaults.json b/data/defaults.json index 5e6515d9..964e5da9 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -3,8 +3,8 @@ "debian_mirror": "http://deb.debian.org/debian", "debian_security_mirror": "http://deb.debian.org/debian-security", "debian_distribution": "buster", - "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", - "vyos_branch": "current", + "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", + "vyos_branch": "equuleus", "kernel_version": "4.19.54", "kernel_flavor": "amd64-vyos", "additional_repositories": [], diff --git a/data/live-build-config/archives/vyos-dev.key.chroot b/data/live-build-config/archives/vyos-dev.key.chroot index a6522e36..9f306a91 100644 --- a/data/live-build-config/archives/vyos-dev.key.chroot +++ b/data/live-build-config/archives/vyos-dev.key.chroot @@ -1,32 +1,53 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v2.0.22 (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 +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 +FhyPysWJ4aNKtAYgVuQguPTt +=rJUC -----END PGP PUBLIC KEY BLOCK----- diff --git a/data/live-build-config/archives/vyos-release.key.chroot b/data/live-build-config/archives/vyos-release.key.chroot index ff47c683..9f306a91 100644 --- a/data/live-build-config/archives/vyos-release.key.chroot +++ b/data/live-build-config/archives/vyos-release.key.chroot @@ -1,52 +1,53 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -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 -8vzPzaWHhkOkU8/J/Ci7+vNtUOZb -=Ld8S +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 +FhyPysWJ4aNKtAYgVuQguPTt +=rJUC -----END PGP PUBLIC KEY BLOCK----- + diff --git a/scripts/live-build-config b/scripts/live-build-config index 9855467d..7a253557 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -68,19 +68,16 @@ debug = build_config['debug'] # Add the additional repositories to package lists print("Setting up additional APT entries") -vyos_repo_entry = "deb {0}/vyos {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) -vyos_debian_repo_entry = "deb {0}/debian {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) +vyos_repo_entry = "deb {0} {1} main\n".format(build_config['vyos_mirror'], build_config['vyos_branch']) apt_file = os.path.join(build_config['build_dir'], defaults.VYOS_REPO_FILE) if debug: print("Adding these entries to {0}:".format(apt_file)) print("\t", vyos_repo_entry) - print("\t", vyos_debian_repo_entry) with open(apt_file, 'w') as f: f.write(vyos_repo_entry) - f.write(vyos_debian_repo_entry) # Add custom APT entries if build_config['custom_apt_entry']: -- cgit v1.2.3 From 9e9f3f164ee393eb820815f5a2b3b56db95f1bcd Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Wed, 14 Aug 2019 16:02:23 +0200 Subject: update Jenkins file for equuleus --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e8b83415..28f3fcb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,7 @@ setDescription() pipeline { options { - disableConcurrentBuilds() + disableConequuleusBuilds() timeout(time: 4, unit: 'HOURS') parallelsAlwaysFailFast() } -- cgit v1.2.3 From a305d899427af9f57d4f067a9bceffeec11be3cb Mon Sep 17 00:00:00 2001 From: UnicronNL Date: Fri, 16 Aug 2019 14:13:25 +0200 Subject: do not disable metadata for openstack images --- tools/cloud-init/openstack/90_dpkg.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/cloud-init/openstack/90_dpkg.cfg b/tools/cloud-init/openstack/90_dpkg.cfg index a740b314..479924cf 100644 --- a/tools/cloud-init/openstack/90_dpkg.cfg +++ b/tools/cloud-init/openstack/90_dpkg.cfg @@ -1,6 +1,5 @@ # to update this file, run dpkg-reconfigure cloud-init datasource_list: [ NoCloud, ConfigDrive, OpenNebula, DigitalOcean, AltCloud, MAAS, OpenStack, CloudSigma, SmartOS, None ] -disable_ec2_metadata: true datasource: OpenStack: max_wait: 6 -- cgit v1.2.3 From b8be8d281587cbed6f5fbf5133c4d7cc1951ea6b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 17 Aug 2019 02:26:41 +0200 Subject: Packages: remove obsolete vyatta-openvpn --- scripts/build-packages | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/build-packages b/scripts/build-packages index 5abd1ea6..8d1447dd 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -157,7 +157,6 @@ vyos_packages = ['vyatta-bash', 'vyatta-cfg-qos', 'vyatta-op-qos', 'vyatta-cfg-op-pppoe', - 'vyatta-openvpn', 'vyatta-nat', 'vyatta-config-mgmt', 'vyatta-config-migrate', -- cgit v1.2.3 From 29dc679dd04deb5f37fb6e94bde5295cfeb8e220 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 21 Aug 2019 11:39:19 -0500 Subject: T1602: add options to default to vyos packages over debian --- scripts/live-build-config | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/live-build-config b/scripts/live-build-config index 7a253557..171b827d 100755 --- a/scripts/live-build-config +++ b/scripts/live-build-config @@ -57,6 +57,7 @@ lb config noauto \ --firmware-binary false \ --updates true \ --security true \ + --apt-options "--yes -oAPT::Default-Release="equuleus" -oAPT::Get::allow-downgrades=true" \ --apt-indices false "${@}" """ -- cgit v1.2.3 From f5bfb71713802f237fa73bb163e18716c2249e56 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 14 Sep 2019 18:25:04 +0200 Subject: Jenkins: fix rename error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6b1ca4ae..ee5b7528 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,7 +66,7 @@ setDescription() pipeline { options { - disableConequuleusBuilds() + disableConcurrentBuilds() timeout(time: 4, unit: 'HOURS') parallelsAlwaysFailFast() } -- cgit v1.2.3 From b2aa30e203e85b9a44b64fd0076225e60123fd46 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 19 Sep 2019 08:33:38 +0200 Subject: Docker: adjustments for Debian 10 (Buster) --- docker/Dockerfile-arm64 | 113 ++++++++++++++++++------------------------------ docker/Dockerfile-armhf | 113 ++++++++++++++++++------------------------------ 2 files changed, 83 insertions(+), 143 deletions(-) diff --git a/docker/Dockerfile-arm64 b/docker/Dockerfile-arm64 index 9625058b..c770dd6a 100644 --- a/docker/Dockerfile-arm64 +++ b/docker/Dockerfile-arm64 @@ -1,4 +1,4 @@ -# Copyright (C) 2018 VyOS maintainers and contributors +# Copyright (C) 2019 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 @@ -16,15 +16,11 @@ # Must be run with --privileged flag, recommended to run the container with a # volume mapped in order to easy export images -FROM multiarch/debian-debootstrap:arm64-jessie-slim +FROM multiarch/debian-debootstrap:arm64-buster-slim LABEL authors="VyOS Maintainers " ENV DEBIAN_FRONTEND noninteractive -COPY no--check-valid-until /etc/apt/apt.conf.d/ -RUN echo "deb http://archive.debian.org/debian jessie main" \ - > /etc/apt/sources.list - # Standard shell should be bash not dash RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ dpkg-reconfigure dash @@ -64,40 +60,18 @@ RUN apt-get update && apt-get install -y \ python3-coverage \ python3-sphinx \ python3-pystache \ + python3-git \ + python3-pip \ pkg-config \ debhelper \ + gosu \ + live-build \ jq -# -# Setup Debian Jessie Backports repository -# -COPY no--check-valid-until /etc/apt/apt.conf.d/ -RUN echo "deb http://archive.debian.org/debian/ jessie-backports main" \ - > /etc/apt/sources.list.d/jessie-backports.list - -RUN apt-get update && apt-get install -y -t jessie-backports \ - python3-git \ - python3-pip - -RUN echo "deb http://deb.debian.org/debian buster main" \ - > /etc/apt/sources.list.d/buster.list - -RUN apt-get update && apt-get install -y \ - golang \ - gosu - -RUN rm -f /etc/apt/sources.list.d/buster.list - # 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 -# -# Remove Debian Jessie Backports repository -# -RUN rm -f /etc/apt/sources.list.d/jessie-backports.list \ - /etc/apt/apt.conf.d/no--check-valid-until - # # Building libvyosconf requires a full configured OPAM/OCaml setup # @@ -142,7 +116,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && git checkout 9a80a5d3 && \ dpkg-buildpackage -uc -us -tc -b && \ -dpkg -i ../libvyosconfig0_*_arm64.deb + dpkg -i ../libvyosconfig0_*_amd64.deb # Packages needed for vyatta-cfg RUN apt-get update && apt-get install -y \ @@ -152,9 +126,12 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyatta-iproute RUN apt-get update && apt-get install -y \ + iptables-dev \ libatm1-dev \ + libcap-dev \ libdb-dev \ - iptables-dev + libelf-dev \ + libselinux1-dev # Packages needed for vyatta-webgui RUN apt-get update && apt-get install -y \ @@ -165,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 \ @@ -178,11 +155,12 @@ 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 \ - libelf-dev + libelf-dev \ + bc \ + kmod # Packages needed for vyos-accel-ppp RUN apt-get update && apt-get install -y \ @@ -193,6 +171,7 @@ RUN apt-get update && apt-get install -y \ # 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 \ + graphviz \ doxygen \ libssh-dev \ libssl-dev @@ -202,18 +181,9 @@ RUN export RTRLIB_VERSION="0.6.3" && \ wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_arm64.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 + 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 \ @@ -227,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 \ @@ -248,18 +213,16 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ whois +# Packages needed for vyos-xe-guest-utilities +RUN apt-get update && apt-get install -y \ + golang + # 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 \ @@ -312,23 +275,31 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ python-all \ python2.7-dev \ - libmysqld-dev - -# 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/* + libmariadb-dev # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ jq -r -M '.current_version')"; \ - echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm.zip" |\ + echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm64.zip" |\ 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 diff --git a/docker/Dockerfile-armhf b/docker/Dockerfile-armhf index 71b5b8bf..f07086e7 100644 --- a/docker/Dockerfile-armhf +++ b/docker/Dockerfile-armhf @@ -1,4 +1,4 @@ -# Copyright (C) 2018 VyOS maintainers and contributors +# Copyright (C) 2019 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 @@ -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 multiarch/debian-debootstrap:armhf-jessie-slim +FROM multiarch/debian-debootstrap:armhf-buster-slim LABEL authors="VyOS Maintainers " ENV DEBIAN_FRONTEND noninteractive -COPY no--check-valid-until /etc/apt/apt.conf.d/ -RUN echo "deb http://deb.debian.org/debian jessie main" \ - > /etc/apt/sources.list \ - && echo "deb http://security.debian.org/debian-security jessie/updates main" \ - >> /etc/apt/sources.list - # Standard shell should be bash not dash RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ dpkg-reconfigure dash @@ -66,40 +60,18 @@ RUN apt-get update && apt-get install -y \ python3-coverage \ python3-sphinx \ python3-pystache \ + python3-git \ + python3-pip \ pkg-config \ debhelper \ + gosu \ + live-build \ jq -# -# Setup Debian Jessie Backports repository -# -COPY no--check-valid-until /etc/apt/apt.conf.d/ -RUN echo "deb http://archive.debian.org/debian/ jessie-backports main" \ - > /etc/apt/sources.list.d/jessie-backports.list - -RUN apt-get update && apt-get install -y -t jessie-backports \ - python3-git \ - python3-pip - -RUN echo "deb http://deb.debian.org/debian buster main" \ - > /etc/apt/sources.list.d/buster.list - -RUN apt-get update && apt-get install -y \ - golang \ - gosu - -RUN rm -f /etc/apt/sources.list.d/buster.list - # 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 -# -# Remove Debian Jessie Backports repository -# -RUN rm -f /etc/apt/sources.list.d/jessie-backports.list \ - /etc/apt/apt.conf.d/no--check-valid-until - # # Building libvyosconf requires a full configured OPAM/OCaml setup # @@ -144,7 +116,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && git checkout 9a80a5d3 && \ dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libvyosconfig0_*_armhf.deb + dpkg -i ../libvyosconfig0_*_amd64.deb # Packages needed for vyatta-cfg RUN apt-get update && apt-get install -y \ @@ -154,9 +126,12 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyatta-iproute RUN apt-get update && apt-get install -y \ + iptables-dev \ libatm1-dev \ + libcap-dev \ libdb-dev \ - iptables-dev + libelf-dev \ + libselinux1-dev # Packages needed for vyatta-webgui RUN apt-get update && apt-get install -y \ @@ -167,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 \ @@ -180,11 +155,12 @@ 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 \ - libelf-dev + libelf-dev \ + bc \ + kmod # Packages needed for vyos-accel-ppp RUN apt-get update && apt-get install -y \ @@ -195,6 +171,7 @@ RUN apt-get update && apt-get install -y \ # 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 \ + graphviz \ doxygen \ libssh-dev \ libssl-dev @@ -204,18 +181,9 @@ RUN export RTRLIB_VERSION="0.6.3" && \ wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_armhf.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 + 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 \ @@ -229,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 \ @@ -250,18 +213,16 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ whois +# Packages needed for vyos-xe-guest-utilities +RUN apt-get update && apt-get install -y \ + golang + # 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 \ @@ -314,15 +275,7 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ python-all \ python2.7-dev \ - libmysqld-dev - -# 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/* + libmariadb-dev # Install packer RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ @@ -331,6 +284,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 1bbbdef6778f85b8e91882239ee070b55f48e5b6 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Thu, 19 Sep 2019 10:31:59 +0200 Subject: add hooks for autobuild --- docker/Dockerfile-arm64 | 314 --------------------------------------- docker/Dockerfile-armhf | 314 --------------------------------------- docker/arm64/Dockerfile | 314 +++++++++++++++++++++++++++++++++++++++ docker/arm64/hooks/post_checkout | 3 + docker/arm64/hooks/pre_build | 4 + docker/armhf/Dockerfile | 314 +++++++++++++++++++++++++++++++++++++++ docker/armhf/hooks/post_checkout | 3 + docker/armhf/hooks/pre_build | 4 + 8 files changed, 642 insertions(+), 628 deletions(-) delete mode 100644 docker/Dockerfile-arm64 delete mode 100644 docker/Dockerfile-armhf create mode 100644 docker/arm64/Dockerfile create mode 100644 docker/arm64/hooks/post_checkout create mode 100644 docker/arm64/hooks/pre_build create mode 100644 docker/armhf/Dockerfile create mode 100644 docker/armhf/hooks/post_checkout create mode 100644 docker/armhf/hooks/pre_build diff --git a/docker/Dockerfile-arm64 b/docker/Dockerfile-arm64 deleted file mode 100644 index c770dd6a..00000000 --- a/docker/Dockerfile-arm64 +++ /dev/null @@ -1,314 +0,0 @@ -# Copyright (C) 2019 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 multiarch/debian-debootstrap:arm64-buster-slim -LABEL authors="VyOS Maintainers " - -ENV DEBIAN_FRONTEND noninteractive - -# Standard shell should be bash not dash -RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ - dpkg-reconfigure dash - -RUN apt-get update && apt-get install -y \ - dialog \ - apt-utils \ - locales - -RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen -ENV LANG en_US.utf8 - -RUN apt-get update && apt-get install -y \ - vim \ - git \ - curl \ - make \ - sudo \ - mc \ - pbuilder \ - devscripts \ - squashfs-tools \ - autoconf \ - automake \ - dpkg-dev \ - genisoimage \ - lsb-release \ - fakechroot \ - libtool \ - libapt-pkg-dev \ - parted \ - kpartx \ - quilt \ - python3-lxml \ - python3-setuptools \ - python3-nose \ - python3-coverage \ - python3-sphinx \ - python3-pystache \ - python3-git \ - python3-pip \ - pkg-config \ - debhelper \ - gosu \ - live-build \ - jq - -# Package needed for mdns-repeater -RUN apt-get update && apt-get install -y \ - dh-systemd - -# -# Building libvyosconf requires a full configured OPAM/OCaml setup -# -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 && \ - 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 - -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 - -RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - ctypes - -# 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 - -# Build libvyosconfig -RUN eval $(opam env --root=/opt/opam --set-root) && \ - git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 9a80a5d3 && \ - dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libvyosconfig0_*_amd64.deb - -# Packages needed for vyatta-cfg -RUN apt-get update && apt-get install -y \ - libglib2.0-dev \ - libperl-dev \ - libboost-filesystem-dev - -# Packages needed for vyatta-iproute -RUN apt-get update && apt-get install -y \ - iptables-dev \ - libatm1-dev \ - libcap-dev \ - libdb-dev \ - libelf-dev \ - libselinux1-dev - -# Packages needed for vyatta-webgui -RUN apt-get update && apt-get install -y \ - libexpat1-dev \ - subversion - -# Packages needed for pmacct -RUN apt-get update && apt-get install -y \ - libpcap-dev \ - libpq-dev \ - default-libmysqlclient-dev \ - libgeoip-dev \ - librabbitmq-dev \ - libjansson-dev \ - 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 \ - libncurses5-dev \ - flex \ - bison \ - libelf-dev \ - bc \ - kmod - -# Packages needed for vyos-accel-ppp -RUN apt-get update && apt-get install -y \ - cdbs \ - cmake \ - liblua5.1-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 \ - graphviz \ - doxygen \ - libssh-dev \ - libssl-dev - -# Build rtrlib release 0.6.3 -RUN export RTRLIB_VERSION="0.6.3" && \ - wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ - tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ - cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb - -# Packages needed to build frr itself -# 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 \ - libpython3-dev \ - python3-dev \ - python3-pytest \ - texinfo - -# Packages needed for conntrack-tools -RUN apt-get update && apt-get install -y \ - libnetfilter-conntrack-dev \ - libnetfilter-cthelper0-dev \ - libnetfilter-cttimeout-dev \ - libnetfilter-queue-dev - -# 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 - -# Packages needed for vyos-xe-guest-utilities -RUN apt-get update && apt-get install -y \ - golang - -# Packages needed for ipaddrcheck -RUN apt-get update && apt-get install -y \ - libcidr0 \ - libcidr-dev \ - check - -# Packages needed for lldpd -RUN apt-get update && apt-get install -y \ - libbsd-dev \ - libevent-dev - -# Packages needed for vyatta-quagga -RUN apt-get update && apt-get install -y \ - 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 \ - dh-apparmor \ - gperf \ - libsystemd-dev \ - python3-stdeb \ - python-setuptools - -# 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 - -# Packages needed for keepalived -RUN apt-get update && apt-get install -y \ - libnl-3-200 \ - libnl-3-dev \ - libnl-nf-3-200 \ - libnl-nf-3-dev \ - libipset-dev \ - libnl-genl-3-200 \ - libnl-genl-3-dev \ - libpopt-dev - -# Packages needed for net-snmp -RUN apt-get update && apt-get install -y \ - python-all \ - python2.7-dev \ - libmariadb-dev - -# Install packer -RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ - jq -r -M '.current_version')"; \ - echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm64.zip" |\ - 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 - -# 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/Dockerfile-armhf b/docker/Dockerfile-armhf deleted file mode 100644 index f07086e7..00000000 --- a/docker/Dockerfile-armhf +++ /dev/null @@ -1,314 +0,0 @@ -# Copyright (C) 2019 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 multiarch/debian-debootstrap:armhf-buster-slim -LABEL authors="VyOS Maintainers " - -ENV DEBIAN_FRONTEND noninteractive - -# Standard shell should be bash not dash -RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ - dpkg-reconfigure dash - -RUN apt-get update && apt-get install -y \ - dialog \ - apt-utils \ - locales - -RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen -ENV LANG en_US.utf8 - -RUN apt-get update && apt-get install -y \ - vim \ - git \ - curl \ - make \ - sudo \ - mc \ - pbuilder \ - devscripts \ - squashfs-tools \ - autoconf \ - automake \ - dpkg-dev \ - genisoimage \ - lsb-release \ - fakechroot \ - libtool \ - libapt-pkg-dev \ - parted \ - kpartx \ - quilt \ - python3-lxml \ - python3-setuptools \ - python3-nose \ - python3-coverage \ - python3-sphinx \ - python3-pystache \ - python3-git \ - python3-pip \ - pkg-config \ - debhelper \ - gosu \ - live-build \ - jq - -# Package needed for mdns-repeater -RUN apt-get update && apt-get install -y \ - dh-systemd - -# -# Building libvyosconf requires a full configured OPAM/OCaml setup -# -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 && \ - 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 - -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 - -RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - ctypes - -# 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 - -# Build libvyosconfig -RUN eval $(opam env --root=/opt/opam --set-root) && \ - git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 9a80a5d3 && \ - dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libvyosconfig0_*_amd64.deb - -# Packages needed for vyatta-cfg -RUN apt-get update && apt-get install -y \ - libglib2.0-dev \ - libperl-dev \ - libboost-filesystem-dev - -# Packages needed for vyatta-iproute -RUN apt-get update && apt-get install -y \ - iptables-dev \ - libatm1-dev \ - libcap-dev \ - libdb-dev \ - libelf-dev \ - libselinux1-dev - -# Packages needed for vyatta-webgui -RUN apt-get update && apt-get install -y \ - libexpat1-dev \ - subversion - -# Packages needed for pmacct -RUN apt-get update && apt-get install -y \ - libpcap-dev \ - libpq-dev \ - default-libmysqlclient-dev \ - libgeoip-dev \ - librabbitmq-dev \ - libjansson-dev \ - 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 \ - libncurses5-dev \ - flex \ - bison \ - libelf-dev \ - bc \ - kmod - -# Packages needed for vyos-accel-ppp -RUN apt-get update && apt-get install -y \ - cdbs \ - cmake \ - liblua5.1-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 \ - graphviz \ - doxygen \ - libssh-dev \ - libssl-dev - -# Build rtrlib release 0.6.3 -RUN export RTRLIB_VERSION="0.6.3" && \ - wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ - tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ - cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb - -# Packages needed to build frr itself -# 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 \ - libpython3-dev \ - python3-dev \ - python3-pytest \ - texinfo - -# Packages needed for conntrack-tools -RUN apt-get update && apt-get install -y \ - libnetfilter-conntrack-dev \ - libnetfilter-cthelper0-dev \ - libnetfilter-cttimeout-dev \ - libnetfilter-queue-dev - -# 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 - -# Packages needed for vyos-xe-guest-utilities -RUN apt-get update && apt-get install -y \ - golang - -# Packages needed for ipaddrcheck -RUN apt-get update && apt-get install -y \ - libcidr0 \ - libcidr-dev \ - check - -# Packages needed for lldpd -RUN apt-get update && apt-get install -y \ - libbsd-dev \ - libevent-dev - -# Packages needed for vyatta-quagga -RUN apt-get update && apt-get install -y \ - 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 \ - dh-apparmor \ - gperf \ - libsystemd-dev \ - python3-stdeb \ - python-setuptools - -# 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 - -# Packages needed for keepalived -RUN apt-get update && apt-get install -y \ - libnl-3-200 \ - libnl-3-dev \ - libnl-nf-3-200 \ - libnl-nf-3-dev \ - libipset-dev \ - libnl-genl-3-200 \ - libnl-genl-3-dev \ - libpopt-dev - -# Packages needed for net-snmp -RUN apt-get update && apt-get install -y \ - python-all \ - python2.7-dev \ - libmariadb-dev - -# Install packer -RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ - jq -r -M '.current_version')"; \ - echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm.zip" |\ - 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 - -# 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/arm64/Dockerfile b/docker/arm64/Dockerfile new file mode 100644 index 00000000..c770dd6a --- /dev/null +++ b/docker/arm64/Dockerfile @@ -0,0 +1,314 @@ +# Copyright (C) 2019 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 multiarch/debian-debootstrap:arm64-buster-slim +LABEL authors="VyOS Maintainers " + +ENV DEBIAN_FRONTEND noninteractive + +# Standard shell should be bash not dash +RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ + dpkg-reconfigure dash + +RUN apt-get update && apt-get install -y \ + dialog \ + apt-utils \ + locales + +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen +ENV LANG en_US.utf8 + +RUN apt-get update && apt-get install -y \ + vim \ + git \ + curl \ + make \ + sudo \ + mc \ + pbuilder \ + devscripts \ + squashfs-tools \ + autoconf \ + automake \ + dpkg-dev \ + genisoimage \ + lsb-release \ + fakechroot \ + libtool \ + libapt-pkg-dev \ + parted \ + kpartx \ + quilt \ + python3-lxml \ + python3-setuptools \ + python3-nose \ + python3-coverage \ + python3-sphinx \ + python3-pystache \ + python3-git \ + python3-pip \ + pkg-config \ + debhelper \ + gosu \ + live-build \ + jq + +# Package needed for mdns-repeater +RUN apt-get update && apt-get install -y \ + dh-systemd + +# +# Building libvyosconf requires a full configured OPAM/OCaml setup +# +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 && \ + 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 + +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 + +RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ + ctypes + +# 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 + +# Build libvyosconfig +RUN eval $(opam env --root=/opt/opam --set-root) && \ + git clone https://github.com/vyos/libvyosconfig.git && \ + cd libvyosconfig && git checkout 9a80a5d3 && \ + dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../libvyosconfig0_*_amd64.deb + +# Packages needed for vyatta-cfg +RUN apt-get update && apt-get install -y \ + libglib2.0-dev \ + libperl-dev \ + libboost-filesystem-dev + +# Packages needed for vyatta-iproute +RUN apt-get update && apt-get install -y \ + iptables-dev \ + libatm1-dev \ + libcap-dev \ + libdb-dev \ + libelf-dev \ + libselinux1-dev + +# Packages needed for vyatta-webgui +RUN apt-get update && apt-get install -y \ + libexpat1-dev \ + subversion + +# Packages needed for pmacct +RUN apt-get update && apt-get install -y \ + libpcap-dev \ + libpq-dev \ + default-libmysqlclient-dev \ + libgeoip-dev \ + librabbitmq-dev \ + libjansson-dev \ + 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 \ + libncurses5-dev \ + flex \ + bison \ + libelf-dev \ + bc \ + kmod + +# Packages needed for vyos-accel-ppp +RUN apt-get update && apt-get install -y \ + cdbs \ + cmake \ + liblua5.1-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 \ + graphviz \ + doxygen \ + libssh-dev \ + libssl-dev + +# Build rtrlib release 0.6.3 +RUN export RTRLIB_VERSION="0.6.3" && \ + wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ + tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ + cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb + +# Packages needed to build frr itself +# 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 \ + libpython3-dev \ + python3-dev \ + python3-pytest \ + texinfo + +# Packages needed for conntrack-tools +RUN apt-get update && apt-get install -y \ + libnetfilter-conntrack-dev \ + libnetfilter-cthelper0-dev \ + libnetfilter-cttimeout-dev \ + libnetfilter-queue-dev + +# 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 + +# Packages needed for vyos-xe-guest-utilities +RUN apt-get update && apt-get install -y \ + golang + +# Packages needed for ipaddrcheck +RUN apt-get update && apt-get install -y \ + libcidr0 \ + libcidr-dev \ + check + +# Packages needed for lldpd +RUN apt-get update && apt-get install -y \ + libbsd-dev \ + libevent-dev + +# Packages needed for vyatta-quagga +RUN apt-get update && apt-get install -y \ + 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 \ + dh-apparmor \ + gperf \ + libsystemd-dev \ + python3-stdeb \ + python-setuptools + +# 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 + +# Packages needed for keepalived +RUN apt-get update && apt-get install -y \ + libnl-3-200 \ + libnl-3-dev \ + libnl-nf-3-200 \ + libnl-nf-3-dev \ + libipset-dev \ + libnl-genl-3-200 \ + libnl-genl-3-dev \ + libpopt-dev + +# Packages needed for net-snmp +RUN apt-get update && apt-get install -y \ + python-all \ + python2.7-dev \ + libmariadb-dev + +# Install packer +RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ + jq -r -M '.current_version')"; \ + echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm64.zip" |\ + 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 + +# 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/arm64/hooks/post_checkout b/docker/arm64/hooks/post_checkout new file mode 100644 index 00000000..fa25f63d --- /dev/null +++ b/docker/arm64/hooks/post_checkout @@ -0,0 +1,3 @@ +#!/bin/bash +# downloads a local copy of qemu on docker-hub build machines +curl -L https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz | tar zxvf - -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . diff --git a/docker/arm64/hooks/pre_build b/docker/arm64/hooks/pre_build new file mode 100644 index 00000000..a08c740b --- /dev/null +++ b/docker/arm64/hooks/pre_build @@ -0,0 +1,4 @@ +#!/bin/bash +# Register qemu-*-static for all supported processors except the +# current one, but also remove all registered binfmt_misc before +docker run --rm --privileged multiarch/qemu-user-static:register --reset diff --git a/docker/armhf/Dockerfile b/docker/armhf/Dockerfile new file mode 100644 index 00000000..f07086e7 --- /dev/null +++ b/docker/armhf/Dockerfile @@ -0,0 +1,314 @@ +# Copyright (C) 2019 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 multiarch/debian-debootstrap:armhf-buster-slim +LABEL authors="VyOS Maintainers " + +ENV DEBIAN_FRONTEND noninteractive + +# Standard shell should be bash not dash +RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ + dpkg-reconfigure dash + +RUN apt-get update && apt-get install -y \ + dialog \ + apt-utils \ + locales + +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen +ENV LANG en_US.utf8 + +RUN apt-get update && apt-get install -y \ + vim \ + git \ + curl \ + make \ + sudo \ + mc \ + pbuilder \ + devscripts \ + squashfs-tools \ + autoconf \ + automake \ + dpkg-dev \ + genisoimage \ + lsb-release \ + fakechroot \ + libtool \ + libapt-pkg-dev \ + parted \ + kpartx \ + quilt \ + python3-lxml \ + python3-setuptools \ + python3-nose \ + python3-coverage \ + python3-sphinx \ + python3-pystache \ + python3-git \ + python3-pip \ + pkg-config \ + debhelper \ + gosu \ + live-build \ + jq + +# Package needed for mdns-repeater +RUN apt-get update && apt-get install -y \ + dh-systemd + +# +# Building libvyosconf requires a full configured OPAM/OCaml setup +# +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 && \ + 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 + +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 + +RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ + ctypes + +# 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 + +# Build libvyosconfig +RUN eval $(opam env --root=/opt/opam --set-root) && \ + git clone https://github.com/vyos/libvyosconfig.git && \ + cd libvyosconfig && git checkout 9a80a5d3 && \ + dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../libvyosconfig0_*_amd64.deb + +# Packages needed for vyatta-cfg +RUN apt-get update && apt-get install -y \ + libglib2.0-dev \ + libperl-dev \ + libboost-filesystem-dev + +# Packages needed for vyatta-iproute +RUN apt-get update && apt-get install -y \ + iptables-dev \ + libatm1-dev \ + libcap-dev \ + libdb-dev \ + libelf-dev \ + libselinux1-dev + +# Packages needed for vyatta-webgui +RUN apt-get update && apt-get install -y \ + libexpat1-dev \ + subversion + +# Packages needed for pmacct +RUN apt-get update && apt-get install -y \ + libpcap-dev \ + libpq-dev \ + default-libmysqlclient-dev \ + libgeoip-dev \ + librabbitmq-dev \ + libjansson-dev \ + 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 \ + libncurses5-dev \ + flex \ + bison \ + libelf-dev \ + bc \ + kmod + +# Packages needed for vyos-accel-ppp +RUN apt-get update && apt-get install -y \ + cdbs \ + cmake \ + liblua5.1-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 \ + graphviz \ + doxygen \ + libssh-dev \ + libssl-dev + +# Build rtrlib release 0.6.3 +RUN export RTRLIB_VERSION="0.6.3" && \ + wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ + tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ + cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb + +# Packages needed to build frr itself +# 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 \ + libpython3-dev \ + python3-dev \ + python3-pytest \ + texinfo + +# Packages needed for conntrack-tools +RUN apt-get update && apt-get install -y \ + libnetfilter-conntrack-dev \ + libnetfilter-cthelper0-dev \ + libnetfilter-cttimeout-dev \ + libnetfilter-queue-dev + +# 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 + +# Packages needed for vyos-xe-guest-utilities +RUN apt-get update && apt-get install -y \ + golang + +# Packages needed for ipaddrcheck +RUN apt-get update && apt-get install -y \ + libcidr0 \ + libcidr-dev \ + check + +# Packages needed for lldpd +RUN apt-get update && apt-get install -y \ + libbsd-dev \ + libevent-dev + +# Packages needed for vyatta-quagga +RUN apt-get update && apt-get install -y \ + 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 \ + dh-apparmor \ + gperf \ + libsystemd-dev \ + python3-stdeb \ + python-setuptools + +# 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 + +# Packages needed for keepalived +RUN apt-get update && apt-get install -y \ + libnl-3-200 \ + libnl-3-dev \ + libnl-nf-3-200 \ + libnl-nf-3-dev \ + libipset-dev \ + libnl-genl-3-200 \ + libnl-genl-3-dev \ + libpopt-dev + +# Packages needed for net-snmp +RUN apt-get update && apt-get install -y \ + python-all \ + python2.7-dev \ + libmariadb-dev + +# Install packer +RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ + jq -r -M '.current_version')"; \ + echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm.zip" |\ + 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 + +# 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/armhf/hooks/post_checkout b/docker/armhf/hooks/post_checkout new file mode 100644 index 00000000..fa25f63d --- /dev/null +++ b/docker/armhf/hooks/post_checkout @@ -0,0 +1,3 @@ +#!/bin/bash +# downloads a local copy of qemu on docker-hub build machines +curl -L https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz | tar zxvf - -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . diff --git a/docker/armhf/hooks/pre_build b/docker/armhf/hooks/pre_build new file mode 100644 index 00000000..a08c740b --- /dev/null +++ b/docker/armhf/hooks/pre_build @@ -0,0 +1,4 @@ +#!/bin/bash +# Register qemu-*-static for all supported processors except the +# current one, but also remove all registered binfmt_misc before +docker run --rm --privileged multiarch/qemu-user-static:register --reset -- cgit v1.2.3 From 672c6153a8c9893095d1595a366660d82d116862 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 19 Sep 2019 18:26:13 +0200 Subject: Docker: arm64/armhf remove amd64 references --- docker/arm64/Dockerfile | 4 ++-- docker/armhf/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index c770dd6a..b45a4f73 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -116,7 +116,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && git checkout 9a80a5d3 && \ dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libvyosconfig0_*_amd64.deb + dpkg -i ../libvyosconfig0_*.deb # Packages needed for vyatta-cfg RUN apt-get update && apt-get install -y \ @@ -181,7 +181,7 @@ RUN export RTRLIB_VERSION="0.6.3" && \ wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb + dpkg -i ../librtr*.deb # Packages needed to build frr itself # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst diff --git a/docker/armhf/Dockerfile b/docker/armhf/Dockerfile index f07086e7..833c563c 100644 --- a/docker/armhf/Dockerfile +++ b/docker/armhf/Dockerfile @@ -116,7 +116,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ cd libvyosconfig && git checkout 9a80a5d3 && \ dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libvyosconfig0_*_amd64.deb + dpkg -i ../libvyosconfig0_*.deb # Packages needed for vyatta-cfg RUN apt-get update && apt-get install -y \ @@ -181,7 +181,7 @@ RUN export RTRLIB_VERSION="0.6.3" && \ wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb + dpkg -i ../librtr*.deb # Packages needed to build frr itself # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst -- cgit v1.2.3 From 9964bbbb239519bdf0a153c1dcddf18cdb4c0fbe Mon Sep 17 00:00:00 2001 From: Kim Date: Fri, 20 Sep 2019 08:41:17 +0200 Subject: Ignore certificates in curl --- docker/armhf/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/armhf/Dockerfile b/docker/armhf/Dockerfile index 833c563c..1ac51b61 100644 --- a/docker/armhf/Dockerfile +++ b/docker/armhf/Dockerfile @@ -79,7 +79,7 @@ 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 -k 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 @@ -278,10 +278,10 @@ RUN apt-get update && apt-get install -y \ libmariadb-dev # Install packer -RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ +RUN export LATEST="$(curl -k -s https://checkpoint-api.hashicorp.com/v1/check/packer | \ jq -r -M '.current_version')"; \ echo "url https://releases.hashicorp.com/packer/"$LATEST"/packer_"$LATEST"_linux_arm.zip" |\ - curl -K- | gzip -d > /usr/bin/packer && \ + curl -k -K- | gzip -d > /usr/bin/packer && \ chmod +x /usr/bin/packer # -- cgit v1.2.3 From 1b3c234f214767df6e7208576fb9ab52e8ec9151 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Fri, 20 Sep 2019 18:44:49 -0500 Subject: T1676: [equuleus] buster: update GRUB boot parameters during upgrade --- .../includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry index 516b8b78..8441cb41 100644 --- a/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry +++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/grub/default-union-grub-entry @@ -1,20 +1,20 @@ menuentry "VyOS (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,115200 console=tty0 + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=ttyS0,115200 console=tty0 initrd /boot//initrd.img } menuentry "VyOS (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,115200 + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=tty0 console=ttyS0,115200 initrd /boot//initrd.img } menuentry "Lost password change (KVM console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=ttyS0,115200 console=tty0 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } menuentry "Lost password change (Serial console)" { - linux /boot//vmlinuz boot=live quiet rootdelay=5 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset + linux /boot//vmlinuz boot=live quiet rootdelay=5 noautologin net.ifnames=0 biosdevname=0 vyos-union=/boot/ console=tty0 console=ttyS0,115200 init=/opt/vyatta/sbin/standalone_root_pw_reset initrd /boot//initrd.img } -- cgit v1.2.3 From 3258d73399c8426c5c28711b93e87c4f6c8f89de Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Mon, 23 Sep 2019 21:33:58 +0200 Subject: Add script to check installation iso with qemu This script installs a system on a emulated qemu host to verify that the iso produced is installable and boots. After the iso is booted from disk it also tries to execute the vyos-smoketest script to verify checks there. --- scripts/check-qemu-install | 349 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100755 scripts/check-qemu-install diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install new file mode 100755 index 00000000..688aa556 --- /dev/null +++ b/scripts/check-qemu-install @@ -0,0 +1,349 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2019, VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# 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 . +# +# File: check-qemu-install +# Purpose: +# This script installs a system on a emulated qemu host to verify +# that the iso produced is installable and boots. +# after the iso is booted from disk it also tries to execute the +# vyos-smoketest script to verify checks there. +# +# For now it will not fail on failed smoketest but will fail on +# install and boot errors. +# Arguments: +# iso iso image to install +# [disk] disk filename to use, if none is provided it +# is autogenerated +# [--keep] Keep the disk image after completion +# [--logfile] name of logfile to save, defaulting to stdout +# [--silent] only print on errors +# [--debug] print all communication with the device + + +import pexpect +import sys +import os +import time +import argparse +import subprocess +import random +import traceback +import logging +import re +from io import BytesIO, StringIO +from datetime import datetime + +EXCEPTION = 0 +now = datetime.now() + + +parser = argparse.ArgumentParser(description='Install and start a test VyOS vm.') +parser.add_argument('iso', help='ISO file to install') +parser.add_argument('disk', help='name of disk image file', + nargs='?', + default='testinstall-{}-{}.img'.format(now.strftime('%Y%m%d-%H%M%S'), + "%04x" % random.randint(0,65535))) +parser.add_argument('--keep', help='Do not remove disk-image after installation', + action='store_true', + default=False) +parser.add_argument('--silent', help='Do not show output on stdout unless an error has occured', + action='store_true', + default=False) +parser.add_argument('--debug', help='Send all debug output to stdout', + action='store_true', + default=False) +parser.add_argument('--logfile', help='Log to file') + +args = parser.parse_args() + +class StreamToLogger(object): + """ + Fake file-like stream object that redirects writes to a logger instance. + """ + def __init__(self, logger, log_level=logging.INFO): + self.logger = logger + self.log_level = log_level + self.linebuf = b'' + self.ansi_escape = re.compile(r'\x1B[@-_][0-?]*[ -/]*[@-~]') + + def write(self, buf): + self.linebuf += buf + #print('.') + while b'\n' in self.linebuf: + f = self.linebuf.split(b'\n', 1) + if len(f) == 2: + self.logger.debug(self.ansi_escape.sub('', f[0].decode(errors="replace").rstrip())) + self.linebuf = f[1] + #print(f) + + + def flush(self): + pass + + +# Setting up logger +log = logging.getLogger() +log.setLevel(logging.DEBUG) + +stl = StreamToLogger(log) +formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') + +handler = logging.StreamHandler(sys.stdout) +if args.silent: + handler.setLevel(logging.ERROR) +elif args.debug: + handler.setLevel(logging.DEBUG) +else: + handler.setLevel(logging.INFO) + +handler.setFormatter(formatter) +log.addHandler(handler) + + +if args.logfile: + filehandler = logging.FileHandler(args.logfile) + filehandler.setLevel(logging.DEBUG) + filehandler.setFormatter(formatter) + log.addHandler(filehandler) + + + +if args.silent: + output = BytesIO() +else: + output = sys.stdout.buffer + +if not os.path.isfile(args.iso): + log.error("Unable to find iso image to install") + sys.exit(1) + + +# Creating diskimage!! + +if not os.path.isfile(args.disk): + log.info("Creating Disk image {}".format(args.disk)) + c = subprocess.check_output(["qemu-img", "create", args.disk, "2G"]) + log.debug(c.decode()) +else: + log.info("Diskimage already exists, using the existing one") + + + +try: + ################################################# + # Installing image to disk + ################################################# + log.info("Installing system") + + cmd = """qemu-system-x86_64 \ + -name "TESTVM" \ + -m 1G \ + -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 \ + -machine accel=kvm \ + -cpu host -smp 2 \ + -vnc 0.0.0.0:99 \ + -nographic \ + -boot d -cdrom {CD} \ + -drive format=raw,file={DISK} + """.format(CD=args.iso, DISK=args.disk) + log.debug("Executing command: {}".format(cmd)) + c = pexpect.spawn(cmd, logfile=stl) + + ################################################# + # Logging into VyOS system + ################################################# + try: + c.expect('Automatic boot in', timeout=10) + c.sendline('') + except pexpect.TIMEOUT: + log.warning("Did not find grub countdown window, ignoring") + + log.info('Waiting for login prompt') + c.expect('[Ll]ogin:', timeout=120) + c.sendline('vyos') + c.expect('[Pp]assword:', timeout=10) + c.sendline('vyos') + c.expect(r'vyos@vyos:~\$') + log.info('Logged in!') + + + ################################################# + # Installing into VyOS system + ################################################# + log.info("Starting installer") + c.sendline('install image') + c.expect('\nWould you like to continue?.*:') + c.sendline('yes') + log.info("Partitioning disk") + c.expect('\nPartition.*:') + c.sendline('') + c.expect('\nInstall the image on.*:') + c.sendline('') + c.expect(r'\nContinue\?.*:') + c.sendline('Yes') + c.expect('\nHow big of a root partition should I create?.*:') + c.sendline('') + log.info('Disk partitioned, installing') + c.expect('\nWhat would you like to name this image?.*:') + c.sendline('') + log.info('Copying files') + c.expect('\nWhich one should I copy to.*:', timeout=300) + c.sendline('') + log.info('Files Copied!') + c.expect('\nEnter password for user.*:') + c.sendline('vyos') + c.expect('\nRetype password for user.*:') + c.sendline('vyos') + c.expect('\nWhich drive should GRUB modify the boot partition on.*:') + c.sendline('') + c.expect(r'\nvyos@vyos:~\$') + log.info('system installed, shutting down') + + ################################################# + # Powering down installer + ################################################# + log.info("Shutting down installation system") + c.sendline('poweroff') + c.expect(r'\nAre you sure you want to poweroff this system.*\]') + c.sendline('Y') + for i in range(30): + log.info("Waiting for shutdown...") + if not c.isalive(): + log.info("VM is shut down!") + break + time.sleep(10) + else: + log.error("VM Did not shut down after 300sec, killing") + c.close() + + + ################################################# + # Booting installed system + ################################################# + log.info("Booting installed system") + + cmd = """qemu-system-x86_64 \ + -name "TESTVM" \ + -m 1G \ + -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 + -machine accel=kvm \ + -cpu host -smp 2 \ + -vnc 0.0.0.0:99 \ + -nographic \ + -drive format=raw,file={DISK} + """.format(DISK=args.disk) + + log.debug('Executing command: {}'.format(cmd)) + c = pexpect.spawn(cmd, logfile=stl) + + ################################################# + # Logging into VyOS system + ################################################# + try: + c.expect('The highlighted entry will be executed automatically in', timeout=10) + c.sendline('') + except pexpect.TIMEOUT: + log.warning("Did not find grub countdown window, ignoring") + + log.info('Waiting for login prompt') + c.expect('[Ll]ogin:', timeout=120) + c.sendline('vyos') + c.expect('[Pp]assword:', timeout=10) + c.sendline('vyos') + c.expect(r'vyos@vyos:~\$') + log.info('Logged in!') + + + + ################################################# + # Executing test-suite + ################################################# + log.info("Executing test-suite ") + + def cr(child, command): + child.sendline(command) + i = child.expect(['\n +Invalid command:', + '\n +Set failed', + 'No such file or directory', + r'\n\S+@\S+[$#]']) + + if i==0: + raise Exception('Invalid command detected') + elif i==1: + raise Exception('Set syntax failed :/') + elif i==2: + log.error("Did not find VyOS-smoketest, this should be an exception") + #raise Exception("WTF? did not find VyOS-smoketest, this should be an exception") + cr(c, '/usr/bin/vyos-smoketest') + + log.info("Smoke test status") + #data = c.before.decode() + + ################################################# + # Powering off system + ################################################# + log.info("Powering off system ") + c.sendline('poweroff') + c.expect(r'\nAre you sure you want to poweroff this system.*\]') + c.sendline('Y') + log.info("Shutting down virtual machine") + for i in range(30): + log.info("Waiting for shutdown...") + if not c.isalive(): + log.info("VM is shut down!") + break + time.sleep(10) + else: + log.error("VM Did not shut down after 300sec") + raise Exception("VM Did not shut down after 300sec") + c.close() + +except pexpect.exceptions.TIMEOUT: + log.error("Timeout waiting for VyOS system") + log.error(traceback.format_exc()) + EXCEPTION = 1 + +except pexpect.exceptions.ExceptionPexpect: + log.error("Exeption while executing QEMU") + log.error("Is qemu working on this system?") + log.error(traceback.format_exc()) + EXCEPTION = 1 + +except Exception: + log.error("An unknown error occured when installing the VyOS system") + traceback.print_exc() + EXCEPTION = 1 + + + +################################################# +# Cleaning up +################################################# +log.info("Cleaning up") + +if not args.keep: + log.info("Removing disk file: {}".format(args.disk)) + try: + os.remove(args.disk) + except Exception: + log.error("Exception while removing diskimage") + log.error(traceback.format_exc()) + EXCEPTION = 1 + +if EXCEPTION: + log.error("Hmm... System got an exception while processing") + log.error("The ISO is not considered usable") + sys.exit(1) -- cgit v1.2.3 From 8bfc9cf65229a6c2406b68dd4a478d78d79743c5 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:30:47 +0200 Subject: Adding test-suite to Jenkins pipeline --- Jenkinsfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4383f230..01887914 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,6 +117,15 @@ 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 + """ + } + } } post { success { -- cgit v1.2.3 From 00752f98ab167ea655d4dc640bf0cd0c6f9c2aec Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:31:59 +0200 Subject: Testsuite: Adding support for running on non-kvm hosts --- scripts/check-qemu-install | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 688aa556..a59b09a1 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -65,7 +65,10 @@ parser.add_argument('--silent', help='Do not show output on stdout unless an err parser.add_argument('--debug', help='Send all debug output to stdout', action='store_true', default=False) -parser.add_argument('--logfile', help='Log to file') +parser.add_argument('--logfile', help='Log to file') +parser.add_argument('--no-kvm', help='Disable use of kvm', + action='store_true', + default=False) args = parser.parse_args() @@ -130,6 +133,14 @@ if not os.path.isfile(args.iso): log.error("Unable to find iso image to install") sys.exit(1) +if args.no_kvm: + log.error("KVM forced off by command line") + kvm=False +elif not os.path.exists("/dev/kvm"): + log.error("KVM is not enabled on host, proceeding with software emulation") + kvm=False +else: + kvm=True # Creating diskimage!! @@ -153,12 +164,14 @@ try: -m 1G \ -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 \ -machine accel=kvm \ - -cpu host -smp 2 \ + {CPU} \ + -smp 2 \ -vnc 0.0.0.0:99 \ -nographic \ -boot d -cdrom {CD} \ + {KVM} \ -drive format=raw,file={DISK} - """.format(CD=args.iso, DISK=args.disk) + """.format(CD=args.iso, DISK=args.disk, KVM="" if kvm else "--no-kvm", CPU="-cpu host" if kvm else "") log.debug("Executing command: {}".format(cmd)) c = pexpect.spawn(cmd, logfile=stl) @@ -240,11 +253,13 @@ try: -m 1G \ -nic user,model=virtio,mac=52:54:99:12:34:56,hostfwd=tcp::2299-:22 -machine accel=kvm \ - -cpu host -smp 2 \ + {CPU} \ + -smp 2 \ -vnc 0.0.0.0:99 \ -nographic \ + {KVM} \ -drive format=raw,file={DISK} - """.format(DISK=args.disk) + """.format(DISK=args.disk, KVM="" if kvm else "--no-kvm", CPU="-cpu host" if kvm else "") log.debug('Executing command: {}'.format(cmd)) c = pexpect.spawn(cmd, logfile=stl) -- cgit v1.2.3 From f5f44f3bc89434b1d4a958f50ad90b03aa34c7f0 Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:32:37 +0200 Subject: Testsuite: Extending timeouts to work on qemu emulated installs --- scripts/check-qemu-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index a59b09a1..a1d93d1a 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -185,7 +185,7 @@ try: log.warning("Did not find grub countdown window, ignoring") log.info('Waiting for login prompt') - c.expect('[Ll]ogin:', timeout=120) + c.expect('[Ll]ogin:', timeout=300) c.sendline('vyos') c.expect('[Pp]assword:', timeout=10) c.sendline('vyos') @@ -274,7 +274,7 @@ try: log.warning("Did not find grub countdown window, ignoring") log.info('Waiting for login prompt') - c.expect('[Ll]ogin:', timeout=120) + c.expect('[Ll]ogin:', timeout=300) c.sendline('vyos') c.expect('[Pp]assword:', timeout=10) c.sendline('vyos') -- cgit v1.2.3 From 21db26a3e76aea73b12cf27b2ed88970db5a619a Mon Sep 17 00:00:00 2001 From: Runar Borge Date: Fri, 27 Sep 2019 21:33:39 +0200 Subject: Testsuite: Adding relative time counter since start in logs --- scripts/check-qemu-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index a1d93d1a..a7c36c78 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -102,7 +102,7 @@ log = logging.getLogger() log.setLevel(logging.DEBUG) stl = StreamToLogger(log) -formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s') +formatter = logging.Formatter('%(asctime)s + %(relativeCreated)-7d - %(levelname)5s - %(message)s') handler = logging.StreamHandler(sys.stdout) if args.silent: -- 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(-) 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(-) 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 1ff1b22726f1f4678dca8295860623d728e20521 Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 8 Oct 2019 11:29:50 -0700 Subject: systemd-services: disable pacemaker, corosync, wpa_supplicant, squid - dusable their autostart at boot time via systemd defaults --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 0caed88a..93e413d0 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -39,5 +39,10 @@ systemctl disable strongswan.service systemctl disable frr.service systemctl disable salt-minion.service systemctl disable nginx.service +systemctl disable pacemaker.service +systemctl disable corosync.service +systemctl disable wpa_supplicant.service +systemctl disable squid.service + systemctl enable vyos-hostsd.service -- cgit v1.2.3 From 29147950487514dd34fa486a5d1d42412a90ce43 Mon Sep 17 00:00:00 2001 From: hagbard Date: Tue, 8 Oct 2019 14:40:36 -0700 Subject: systemd-disable - heartbeat.service disabled --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 93e413d0..42fb3020 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -43,6 +43,7 @@ systemctl disable pacemaker.service systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service +systemctl disable heartbeat.service systemctl enable vyos-hostsd.service -- cgit v1.2.3 From c293b710ab331612ec714c89abb286e0f7c6b7d1 Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 11 Oct 2019 13:02:30 -0700 Subject: acpid: enable acpid to enable power button triggered shutdowns --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 42fb3020..fc6d2b76 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -47,3 +47,4 @@ systemctl disable heartbeat.service systemctl enable vyos-hostsd.service +systemctl enable acpid.service -- cgit v1.2.3 From 87f3fa05fb1cf9cb9c9f8d583fd3a86f99d61293 Mon Sep 17 00:00:00 2001 From: hagbard Date: Mon, 21 Oct 2019 12:17:21 -0700 Subject: Kernel: update to 4.19.76 in defaults.json --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index a8b8e8d3..8714a470 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "4.19.67", + "kernel_version": "4.19.79", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] -- cgit v1.2.3 From 4b61416f466846f5dfedd4194a1d6a7f590b9850 Mon Sep 17 00:00:00 2001 From: hagbard Date: Mon, 21 Oct 2019 12:24:43 -0700 Subject: kernel-version: fixing typo --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index 8714a470..636c1476 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "4.19.79", + "kernel_version": "4.19.76", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] -- 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(-) 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 bbf03fbde865234082637681c34f1904f980a32c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 10 Nov 2019 13:20:22 +0100 Subject: Kernel: T1791: update to Linux 4.19.82 (cherry picked from commit d68054f2930ea410ef04a4c24a938e9021307004) --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index 636c1476..b7f9ebcd 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "4.19.76", + "kernel_version": "4.19.82", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] -- cgit v1.2.3 From 9986845896f64f6a3b5556519fb26b678b59d1be Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 11 Nov 2019 16:39:40 +0100 Subject: hooks: synchronize Linux Firmware with current branch Imported from commit 2382c90dc7a30d17628a11f9ff41f8c63867887a --- .../hooks/live/40-linux-firmware.chroot | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/data/live-build-config/hooks/live/40-linux-firmware.chroot b/data/live-build-config/hooks/live/40-linux-firmware.chroot index cd944faf..d3f34dec 100755 --- a/data/live-build-config/hooks/live/40-linux-firmware.chroot +++ b/data/live-build-config/hooks/live/40-linux-firmware.chroot @@ -2,15 +2,22 @@ # To get the possibility of reproducible builds we pin to a specific commit # of the linux-firmware repository -COMMIT="7bc246451318b3536d9bfd3c4e46d541a9831b33" +COMMIT="aa95e90b2c638f1ca6647d12b2d1b18284428f9c" -echo I: Retrieving Linux Firmware - commit ${COMMIT} +echo "I: Retrieving Linux Firmware - commit ${COMMIT}" -curl -o /tmp/linux-firmware-${COMMIT}.tar.gz \ - https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz -tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /lib -mv /lib/linux-firmware-${COMMIT} /lib/firmware -rm -f /tmp/linux-firmware-${COMMIT}.tar.gz +ret=$(curl -w "%{http_code}" -o /tmp/linux-firmware-${COMMIT}.tar.gz \ + https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${COMMIT}.tar.gz) + +if [ "${ret}" != "200" ]; then + echo E: Received HTTP error code \"${ret}\" when downloading Linux Firmware ... + exit 1 +fi + +tar xf /tmp/linux-firmware-${COMMIT}.tar.gz -C /tmp +mkdir -p /lib/firmware +mv /tmp/linux-firmware-${COMMIT}/* /lib/firmware +rm -rf /tmp/linux-firmware-${COMMIT}* # We do not need all firmware blobs .. cleanup RM_FIRMWARE=" \ -- cgit v1.2.3 From 932bc30211d7351324f6fe25a63087de0fb6914f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 12 Nov 2019 22:12:46 +0100 Subject: Kernel: T1800: update to Linux 4.19.84 (cherry picked from commit 460dbeaa04213d722ea95069eca82be8edb345de) --- data/defaults.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.json b/data/defaults.json index b7f9ebcd..ff02384c 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "4.19.82", + "kernel_version": "4.19.84", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] -- 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(+) 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 From 9ff7a6b3ae7135664fd484209d4f325e60cc6dc7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 28 Nov 2019 18:39:10 +0100 Subject: Jenkins: archive ISO on failed builds if possible Imagine there is a proper build ISO but the tests are failing. It should be possible to check the ISO afterwards. --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e86cd4e9..ae964099 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -147,6 +147,10 @@ pipeline { } } } + failure { + archiveArtifacts artifacts: 'build/live-image-amd64.hybrid.iso', + allowEmptyArchive: true + } cleanup { echo 'One way or another, I have finished' // the 'build' directory got elevated permissions during the build -- cgit v1.2.3 From af920bd3be793e27d5460deb693ae14d42e246fa Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 09:24:23 -0800 Subject: syslog: T1834: 'del system syslog' doesn't stop rsyslog - disbled autostart at boot via systemd --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index fc6d2b76..54f1fa5c 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -44,6 +44,8 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service +systemctl disable syslog.socket +systemctl disable rsyslog.service systemctl enable vyos-hostsd.service -- cgit v1.2.3 From 672cff5ebf2a61ed5bc075fcab03a806d3c1139c Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 11:05:27 -0800 Subject: syslog: T1834: 'del system syslog' doesn't stop rsyslog - disable syslog.socket unit is not required, it's no service --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 54f1fa5c..4ae8d478 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -44,7 +44,6 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service -systemctl disable syslog.socket systemctl disable rsyslog.service -- cgit v1.2.3 From 2a5c58f4d0624243cbcc1a8070bd5446da948aba Mon Sep 17 00:00:00 2001 From: hagbard Date: Fri, 29 Nov 2019 12:17:08 -0800 Subject: rsyslog: disabling rsyslog causes start issues if required - socket.service can be found since disabling rsyslog removes the link to socket.service too and causes a dependency error --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 4ae8d478..b726bc3a 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -44,8 +44,6 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service -systemctl disable rsyslog.service - systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From dc9051e57c486041e6eeb07195b2b7a6e67f727a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:07:01 +0100 Subject: ndisc6: add ICMPv6 Neighbor Discovery tool (cherry picked from commit 3206c774c70dc87aaf7301b111f82df8d897bb12) --- data/live-build-config/package-lists/vyos-utils.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot index ee2073fb..5de95816 100644 --- a/data/live-build-config/package-lists/vyos-utils.list.chroot +++ b/data/live-build-config/package-lists/vyos-utils.list.chroot @@ -27,3 +27,4 @@ bgpq3 libnss-myhostname ssl-cert nginx-light +ndisc6 -- cgit v1.2.3 From a276c3e7f9b4cb913e240c71ac13c1213a6a38bb Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:18:48 +0100 Subject: systemd: apt: disable daily update service As VyOS does not make use of APT for updating the system it is useless to run this service. --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index b726bc3a..511b45df 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -44,6 +44,10 @@ systemctl disable corosync.service systemctl disable wpa_supplicant.service systemctl disable squid.service systemctl disable heartbeat.service +systemctl disable apt-daily.service +systemctl disable apt-daily.timer +systemctl disable apt-daily-upgrade.timer +systemctl disable apt-daily-upgrade.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From baf8e096afcb7781997c2a1d5ec2058218eb1ba9 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 20:30:25 +0100 Subject: systemd: pcscd: disable SmartCard service PCSC is included via a dependency of wpa_supplicant. vyos@vyos:~$ apt-cache rdepends pcscd pcscd Reverse Depends: libpcsclite1 opensc libpcsclite1 vyos@vyos:~$ apt-cache rdepends libpcsclite1 libpcsclite1 Reverse Depends: pcscd wpasupplicant --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 511b45df..d3de9a43 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -48,6 +48,7 @@ systemctl disable apt-daily.service systemctl disable apt-daily.timer systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.service +systemctl disable pcscd.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From f2dd696099c684efd2b9deb19db169082487320a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:00:34 +0100 Subject: systemd: man: do not rebuild man db once a day --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index d3de9a43..5d591e7e 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -49,6 +49,7 @@ systemctl disable apt-daily.timer systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.service systemctl disable pcscd.service +systemctl disable man-db.timer systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From 51d1f85b515357f20fa75d08d175641e383c92f8 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:00:50 +0100 Subject: systemd: ntp: service is handled by VyOS CLI --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 5d591e7e..c0c24728 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -50,6 +50,7 @@ systemctl disable apt-daily-upgrade.timer systemctl disable apt-daily-upgrade.service systemctl disable pcscd.service systemctl disable man-db.timer +systemctl disable ntp.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From 143dfc0c67bef36d7d4f30fb052605b8ec6b1460 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:01:35 +0100 Subject: systemd: igmpproxy: service is handled by VyOS CLI --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index c0c24728..30ed2c7a 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -51,6 +51,7 @@ systemctl disable apt-daily-upgrade.service systemctl disable pcscd.service systemctl disable man-db.timer systemctl disable ntp.service +systemctl disable igmpproxy.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3 From 736de7a6bbfb4808eaaab27b7c18817183383e5f Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 2 Dec 2019 21:02:22 +0100 Subject: systemd: cryptsetup: we do not support encrypted volumes --- data/live-build-config/hooks/live/18-enable-disable_services.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 30ed2c7a..50325aeb 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -52,6 +52,7 @@ systemctl disable pcscd.service systemctl disable man-db.timer systemctl disable ntp.service systemctl disable igmpproxy.service +systemctl disable cryptsetup.service systemctl enable vyos-hostsd.service systemctl enable acpid.service -- cgit v1.2.3