diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 74 |
1 files changed, 63 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index f1fac187..ab6b1c51 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2021 VyOS maintainers and contributors +# Copyright (C) 2018-2022 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 @@ -94,6 +94,9 @@ RUN apt-get update && apt-get install -y \ debootstrap \ live-build +# vyos-build now also makes use of TOML - install yq which has toml support +RUN pip install yq==3.1.0 + # Syslinux and Grub2 is only supported on x86 and x64 systems RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ apt-get update && apt-get install -y \ @@ -132,7 +135,8 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ ctypes \ ctypes-foreign \ ctypes-build \ - containers + containers \ + fileutils # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ @@ -214,13 +218,6 @@ RUN apt-get update && apt-get install -y \ pciutils \ yasm -# Packages needed for Accel-PPP -RUN apt-get update && apt-get install -y \ - liblua5.3-dev \ - libssl1.1 \ - libssl-dev \ - libpcre3-dev - # Packages needed for Wireguard RUN apt-get update && apt-get install -y \ debhelper-compat \ @@ -339,6 +336,11 @@ Run git clone https://github.com/dsoprea/PyInotify.git /tmp/inotify && \ python3 setup.py --command-packages=stdeb.command bdist_deb && \ sudo dpkg -i ./deb_dist/python3-inotify*.deb +Run git clone https://github.com/nficano/humps.git /tmp/humps && \ + cd /tmp/humps && git checkout v3.8.0 && \ + python3 setup.py --command-packages=stdeb.command bdist_deb; cp deb_dist/*.deb .. && \ + dpkg -i /tmp/python3-pyhumps_*_all.deb + # Packages needed for vyos-1x-xdp package, gcc-multilib is not available on # arm64 but required by XDP RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ @@ -348,9 +350,8 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ llvm \ libelf-dev \ libpcap-dev \ + libbpf-dev \ build-essential; \ - git clone https://github.com/libbpf/libbpf.git /tmp/libbpf && \ - cd /tmp/libbpf && git checkout b91f53ec5f1aba2 && cd src && make install; \ fi # Go required for validators and vyos-xe-guest-utilities @@ -471,6 +472,35 @@ RUN apt-get update && apt-get install -y \ libtool \ pkg-config +# Packages needed for nftables +RUN apt-get update && apt-get install -y \ + asciidoc-base \ + automake \ + bison \ + debhelper-compat \ + dh-python \ + docbook-xsl \ + flex \ + libeditreadline-dev \ + libgmp-dev \ + libjansson-dev \ + libmnl-dev \ + libtool \ + libxtables-dev \ + python3-all \ + python3-setuptools \ + xsltproc + +# Packages needed for libnetfilter-conntrack +RUN apt-get update && apt-get install -y \ + debhelper-compat \ + libmnl-dev \ + libnfnetlink-dev \ + libnetfilter-cthelper-dev \ + libnetfilter-cttimeout-dev \ + libnetfilter-queue-dev \ + libtool + # Packages needed for wide-dhcpv6 RUN apt-get update && apt-get install -y \ bison \ @@ -595,6 +625,28 @@ RUN apt-get update && sudo apt-get install -y \ runc \ uidmap +# Packages needed for Accel-PPP +# XXX: please note that this must be installed after nftable dependencies - otherwise +# APT will remove liblua5.3-dev which breaks the Accel-PPP build +RUN apt-get update && apt-get install -y \ + liblua5.3-dev \ + libssl1.1 \ + libssl-dev \ + libpcre3-dev + +# Packages needed for sstp-client +RUN apt-get update && apt-get install -y \ + libssl-dev \ + libevent-dev \ + ppp-dev + +# Packages needed for pam_tacplus +RUN apt-get update && apt-get install -y \ + libpam-dev \ + autoconf-archive \ + gnulib \ + libtool + # # fpm: a command-line program designed to help you build packages (e.g. deb) # |