summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-04-01 20:59:55 +0200
committerChristian Poessinger <christian@poessinger.com>2019-04-02 21:16:33 +0200
commit089c81935f4c2488e27420d277fbbec5bd4d2547 (patch)
treeda35f3790e1a8cfa6d740dfe68583afc9ac35301 /docker
parentbfc366424fc27b0180d1205e320b4f617fd13a26 (diff)
downloadvyos-build-089c81935f4c2488e27420d277fbbec5bd4d2547.tar.gz
vyos-build-089c81935f4c2488e27420d277fbbec5bd4d2547.zip
Docker: use prebuild libyang packages
Building libyang is horrible and not even possible on Debian OldStable. Thus take the change and use the FRR provided binaries inside the Docker container.
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile17
1 files changed, 7 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 074e206e..81fa2554 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -184,17 +184,14 @@ RUN export RTRLIB_VERSION="0.6.3" && \
cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \
dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb
+# FRR depends on the relatively new libyang library to provide YANG/NETCONF
+# support. Unfortunately, most distributions do not yet offer a libyang package
+# from their repositories. Use prebuild libyang packages
#
-RUN apt-get update && apt-get install -y -t jessie-backports \
- swig \
- libcmocka-dev \
- libcmocka0
-
-RUN export LIBYANG_COMMIT="179da47f2e8de" && \
- git clone https://github.com/opensourcerouting/libyang.git && \
- cd libyang && git checkout $LIBYANG_COMMIT && mkdir build && cd build && \
- cmake .. && make build-deb && \
- dpkg -i debs/*.deb
+# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
+RUN wget -P /tmp https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-8/Debian-AMD64-Packages/libyang-dev_0.16.105-1_amd64.deb && \
+ wget -P /tmp https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-8/Debian-AMD64-Packages/libyang0.16_0.16.105-1_amd64.deb && \
+ dpkg -i /tmp/libyang*_amd64.deb
# Packages needed to build frr itself
RUN apt-get update && apt-get install -y \