summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile17
1 files changed, 5 insertions, 12 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index de6b147f..595f0909 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -222,18 +222,6 @@ RUN apt-get update && apt-get install -y \
build-essential
RUN gem install --no-document fpm
-# Build rtrlib release 0.8.0
-RUN export RTRLIB_VERSION="0.8.0" export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \
- git clone https://github.com/rtrlib/rtrlib.git /tmp/rtrlib && cd /tmp/rtrlib && \
- mk-build-deps --install --tool "apt-get --yes --no-install-recommends" && \
- 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.128" 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 \
@@ -243,6 +231,7 @@ RUN pip install --break-system-packages \
fakeroot \
iproute2 \
libzmq3-dev \
+ procps \
python3 \
python3-setuptools \
python3-inotify \
@@ -362,6 +351,10 @@ RUN apt-get update && apt-get install -y \
libnl-genl-3-dev \
libxtables-dev
+# Packages needed for nftables
+RUN apt-get update && apt-get install -y \
+ asciidoc-base
+
# Allow password-less 'sudo' for all users in group 'sudo'
RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \