diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-04-09 20:14:26 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-04-09 20:15:14 +0200 |
| commit | 8d8a1a7a39811cf0d0f8dcaca65d97da67e779fa (patch) | |
| tree | 5765e8137b305484215b3300ce8f2ef96d0eb1c3 /docker/Dockerfile | |
| parent | dce9b82bd1bfa778572ad712ddeab3a7b06d3545 (diff) | |
| download | vyos-build-8d8a1a7a39811cf0d0f8dcaca65d97da67e779fa.tar.gz vyos-build-8d8a1a7a39811cf0d0f8dcaca65d97da67e779fa.zip | |
Docker: use libyang from VyOS project reposi
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 81fa2554..36895335 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,6 +23,9 @@ ENV DEBIAN_FRONTEND noninteractive COPY sources.list /etc/apt/sources.list COPY no--check-valid-until /etc/apt/apt.conf.d/ +COPY vyos-dev.key /tmp/vyos-dev.key + +RUN apt-key add /tmp/vyos-dev.key # Standard shell should be bash not dash RUN echo "dash dash/sh boolean false" | debconf-set-selections && \ @@ -184,17 +187,13 @@ 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 -# -# 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 +# libyang-dev packages are hsoted on dev.packages.vyos.net see +# 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 \ |