From ae5e390d84c19faa3886dc4370213fd52a5ee867 Mon Sep 17 00:00:00 2001 From: Kim Hagen Date: Thu, 19 Sep 2019 10:31:59 +0200 Subject: add hooks for autobuild (cherry picked from commit 1bbbdef6778f85b8e91882239ee070b55f48e5b6) --- docker/Dockerfile-arm64 | 343 -------------------------------------- docker/Dockerfile-armhf | 345 --------------------------------------- docker/arm64/Dockerfile | 343 ++++++++++++++++++++++++++++++++++++++ docker/arm64/hooks/post_checkout | 3 + docker/arm64/hooks/pre_build | 4 + docker/armhf/Dockerfile | 345 +++++++++++++++++++++++++++++++++++++++ docker/armhf/hooks/post_checkout | 3 + docker/armhf/hooks/pre_build | 4 + 8 files changed, 702 insertions(+), 688 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 (limited to 'docker') diff --git a/docker/Dockerfile-arm64 b/docker/Dockerfile-arm64 deleted file mode 100644 index 9625058b..00000000 --- a/docker/Dockerfile-arm64 +++ /dev/null @@ -1,343 +0,0 @@ -# Copyright (C) 2018 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# in order to easy exprort images built to "external" world -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Must be run with --privileged flag, recommended to run the container with a -# volume mapped in order to easy export images - -FROM multiarch/debian-debootstrap:arm64-jessie-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 - -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 \ - pkg-config \ - debhelper \ - 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 \ - 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 -# -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_*_arm64.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 \ - libatm1-dev \ - libdb-dev \ - iptables-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 \ - 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 \ - kernel-package \ - libncurses5-dev \ - flex \ - bison \ - libelf-dev - -# 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 \ - 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*_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 - -# Packages needed to build frr itself -# libyang-dev packages are hsoted on dev.packages.vyos.net see -# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst -# for more info -RUN apt-get update && apt-get install -y \ - libyang-dev \ - libyang0.16 \ - chrpath \ - install-info \ - libjson-c-dev \ - libpython3-dev \ - python3-dev \ - 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 \ - 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 ipaddrcheck -RUN apt-get update && apt-get install -y \ - check - -# As there is no Debian Jessie/Stretch package for libcidr available but this -# is required for ipaddrcheck we have to build it from source -RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ - cd analytics-libcidr && \ - git checkout 026c611d90a1 && \ - dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libcidr*.deb - -# Packages needed for lldpd -RUN apt-get update && apt-get install -y \ - libbsd-dev \ - libevent-dev - -# Packages needed for 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 \ - 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/* - -# 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 - -# 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 71b5b8bf..00000000 --- a/docker/Dockerfile-armhf +++ /dev/null @@ -1,345 +0,0 @@ -# Copyright (C) 2018 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# in order to easy exprort images built to "external" world -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# Must be run with --privileged flag, recommended to run the container with a -# volume mapped in order to easy export images - -FROM multiarch/debian-debootstrap:armhf-jessie-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 - -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 \ - pkg-config \ - debhelper \ - 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 \ - 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 -# -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_*_armhf.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 \ - libatm1-dev \ - libdb-dev \ - iptables-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 \ - 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 \ - kernel-package \ - libncurses5-dev \ - flex \ - bison \ - libelf-dev - -# 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 \ - 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*_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 - -# Packages needed to build frr itself -# libyang-dev packages are hsoted on dev.packages.vyos.net see -# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst -# for more info -RUN apt-get update && apt-get install -y \ - libyang-dev \ - libyang0.16 \ - chrpath \ - install-info \ - libjson-c-dev \ - libpython3-dev \ - python3-dev \ - 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 \ - 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 ipaddrcheck -RUN apt-get update && apt-get install -y \ - check - -# As there is no Debian Jessie/Stretch package for libcidr available but this -# is required for ipaddrcheck we have to build it from source -RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ - cd analytics-libcidr && \ - git checkout 026c611d90a1 && \ - dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../libcidr*.deb - -# Packages needed for lldpd -RUN apt-get update && apt-get install -y \ - libbsd-dev \ - libevent-dev - -# Packages needed for 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 \ - 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/* - -# 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 - -# 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..9625058b --- /dev/null +++ b/docker/arm64/Dockerfile @@ -0,0 +1,343 @@ +# Copyright (C) 2018 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# in order to easy exprort images built to "external" world +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Must be run with --privileged flag, recommended to run the container with a +# volume mapped in order to easy export images + +FROM multiarch/debian-debootstrap:arm64-jessie-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 + +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 \ + pkg-config \ + debhelper \ + 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 \ + 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 +# +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_*_arm64.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 \ + libatm1-dev \ + libdb-dev \ + iptables-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 \ + 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 \ + kernel-package \ + libncurses5-dev \ + flex \ + bison \ + libelf-dev + +# 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 \ + 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*_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 + +# Packages needed to build frr itself +# libyang-dev packages are hsoted on dev.packages.vyos.net see +# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst +# for more info +RUN apt-get update && apt-get install -y \ + libyang-dev \ + libyang0.16 \ + chrpath \ + install-info \ + libjson-c-dev \ + libpython3-dev \ + python3-dev \ + 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 \ + 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 ipaddrcheck +RUN apt-get update && apt-get install -y \ + check + +# As there is no Debian Jessie/Stretch package for libcidr available but this +# is required for ipaddrcheck we have to build it from source +RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ + cd analytics-libcidr && \ + git checkout 026c611d90a1 && \ + dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../libcidr*.deb + +# Packages needed for lldpd +RUN apt-get update && apt-get install -y \ + libbsd-dev \ + libevent-dev + +# Packages needed for 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 \ + 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/* + +# 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 + +# 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..71b5b8bf --- /dev/null +++ b/docker/armhf/Dockerfile @@ -0,0 +1,345 @@ +# Copyright (C) 2018 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# in order to easy exprort images built to "external" world +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Must be run with --privileged flag, recommended to run the container with a +# volume mapped in order to easy export images + +FROM multiarch/debian-debootstrap:armhf-jessie-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 + +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 \ + pkg-config \ + debhelper \ + 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 \ + 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 +# +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_*_armhf.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 \ + libatm1-dev \ + libdb-dev \ + iptables-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 \ + 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 \ + kernel-package \ + libncurses5-dev \ + flex \ + bison \ + libelf-dev + +# 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 \ + 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*_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 + +# Packages needed to build frr itself +# libyang-dev packages are hsoted on dev.packages.vyos.net see +# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst +# for more info +RUN apt-get update && apt-get install -y \ + libyang-dev \ + libyang0.16 \ + chrpath \ + install-info \ + libjson-c-dev \ + libpython3-dev \ + python3-dev \ + 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 \ + 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 ipaddrcheck +RUN apt-get update && apt-get install -y \ + check + +# As there is no Debian Jessie/Stretch package for libcidr available but this +# is required for ipaddrcheck we have to build it from source +RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \ + cd analytics-libcidr && \ + git checkout 026c611d90a1 && \ + dpkg-buildpackage -uc -us -tc -b && \ + dpkg -i ../libcidr*.deb + +# Packages needed for lldpd +RUN apt-get update && apt-get install -y \ + libbsd-dev \ + libevent-dev + +# Packages needed for 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 \ + 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/* + +# 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 + +# 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 42bc91b74bc5234de7caf0ec0457ef172063e2e6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 23 Sep 2019 21:23:45 +0200 Subject: Docker: add dkms --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index d54603c4..79545eab 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -176,7 +176,8 @@ RUN apt-get update && apt-get install -y \ libncurses5-dev \ flex \ bison \ - libelf-dev + libelf-dev \ + dkms # Packages needed for vyos-accel-ppp RUN apt-get update && apt-get install -y \ -- cgit v1.2.3 From b88f9447ff7a407a89295c49beb3d9c694b52890 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 2 Oct 2019 23:27:26 +0200 Subject: Docker: add liblua5.2-dev to accel-ppp dependencies --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 79545eab..e5ce8152 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -183,7 +183,8 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ cdbs \ cmake \ - liblua5.1-dev + liblua5.1-dev \ + liblua5.2-dev # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html -- cgit v1.2.3 From dc5ebff17fa15a81a8c510703d854bc56905d14e Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 3 Oct 2019 11:23:31 +0200 Subject: Docker: we only need LUA 5.2 for Accel-PPP build --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index e5ce8152..3befeea0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -179,11 +179,10 @@ RUN apt-get update && apt-get install -y \ libelf-dev \ dkms -# Packages needed for vyos-accel-ppp +# Packages needed for Accel-ppp RUN apt-get update && apt-get install -y \ cdbs \ cmake \ - liblua5.1-dev \ liblua5.2-dev # Prerequisites for building rtrlib -- cgit v1.2.3 From ee11c5034db48b10692cf85b164729b86c259e86 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 4 Oct 2019 19:58:45 +0200 Subject: Docker: ARM: add missing no--check-valid-until files --- docker/arm64/no--check-valid-until | 1 + docker/armhf/no--check-valid-until | 1 + 2 files changed, 2 insertions(+) create mode 100644 docker/arm64/no--check-valid-until create mode 100644 docker/armhf/no--check-valid-until (limited to 'docker') diff --git a/docker/arm64/no--check-valid-until b/docker/arm64/no--check-valid-until new file mode 100644 index 00000000..27ed79f3 --- /dev/null +++ b/docker/arm64/no--check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until "0"; diff --git a/docker/armhf/no--check-valid-until b/docker/armhf/no--check-valid-until new file mode 100644 index 00000000..27ed79f3 --- /dev/null +++ b/docker/armhf/no--check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until "0"; -- cgit v1.2.3