summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-22 17:24:22 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-22 17:24:22 +0100
commitf3f962fd2bafc502da4e5657c96166e19a10f22b (patch)
treedacda14eb33be031216cee4767a1f17581717317 /docker
parent7743524c0734de20d0b42b9154978368c3f01626 (diff)
downloadvyos-build-f3f962fd2bafc502da4e5657c96166e19a10f22b.tar.gz
vyos-build-f3f962fd2bafc502da4e5657c96166e19a10f22b.zip
frr: T3146: upgrade to Free Range Routing 7.5 series
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile13
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6964a289..a2ccac1f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -257,12 +257,19 @@ RUN export RTRLIB_VERSION="0.6.3" && \
cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \
dpkg -i ../librtr*_$(dpkg-architecture -qDEB_HOST_ARCH).deb ../librtr*_all.deb
-# Packages needed to build frr itself
+# Upgrading to FRR 7.5 requires a more recent version of libyang which is only
+# available from Debian Bullseye
+RUN echo "deb http://deb.debian.org/debian/ bullseye main" \
+ > /etc/apt/sources.list.d/bullseye-backports.list && \
+ apt-get update && apt-get install -y -t bullseye \
+ libyang-dev \
+ libyang1; \
+ rm -f /etc/apt/sources.list.d/bullseye-backports.list
+
+# 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 \