diff options
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e6b42e0d..a1d22b26 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -138,7 +138,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#cd4d7582 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#f11f0148 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ @@ -149,7 +149,7 @@ RUN apt-get update && apt-get install -y \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \ - cd /tmp/libvyosconfig && git checkout ec930f94 && \ + cd /tmp/libvyosconfig && git checkout 63175de4 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb @@ -183,13 +183,15 @@ RUN wget https://salsa.debian.org/klausenbusk-guest/debootstrap/commit/a9a603b17 RUN apt-get update && apt-get install -y \ gnupg2 \ rsync \ + libelf-dev \ libncurses5-dev \ flex \ bison \ bc \ kmod \ cpio \ - python-is-python3 + python-is-python3 \ + dwarves # Packages needed for Intel QAT out-of-tree drivers # FPM is used when generation Debian pckages for e.g. Intel QAT drivers @@ -210,6 +212,11 @@ RUN export RTRLIB_VERSION="0.8.0" export ARCH=$(dpkg-architecture -qDEB_HOST_ARC dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb +RUN export LIBYANG_VERSION="v2.1.80" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \ + git clone https://github.com/CESNET/libyang.git /tmp/libyang && cd /tmp/libyang && \ + pipx run apkg build -i && find pkg/pkgs -type f -name *.deb -exec mv -t .. {} + && \ + dpkg -i ../libyang*.deb + # Packages needed for vyos-1x RUN pip install --break-system-packages \ git+https://github.com/aristanetworks/j2lint.git@341b5d5db86 \ @@ -236,19 +243,6 @@ RUN pip install --break-system-packages \ quilt \ whois -# 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 \ - apt-get update && apt-get install -y \ - gcc-multilib \ - clang \ - llvm \ - libelf-dev \ - libpcap-dev \ - libbpf-dev \ - build-essential; \ - fi - # Go required for validators and vyos-xe-guest-utilities RUN GO_VERSION_INSTALL="1.18.3" ; \ wget -O /tmp/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-$(dpkg-architecture -qDEB_HOST_ARCH).tar.gz ; \ |