diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-07 23:57:15 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-01-08 17:22:39 +0100 |
| commit | 248224bbb1b053c8968fca6682070ef0ae474008 (patch) | |
| tree | 57f0f84e5536e86836fd9dbaf62d76e23c63fde5 /docker | |
| parent | 9f4e0bf75f74647b2e3a4d1567297a7932ab72d9 (diff) | |
| download | vyos-build-248224bbb1b053c8968fca6682070ef0ae474008.tar.gz vyos-build-248224bbb1b053c8968fca6682070ef0ae474008.zip | |
Docker: do not install librtr-doc to avoid pulling in additional dependencies
(cherry picked from commit 5fc508b2dda57652b51702c7eb11d9ca7823108f)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 49531a83..416fdb11 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -240,20 +240,20 @@ RUN apt-get update && apt-get install -y \ libssl-dev # Build rtrlib release 0.6.3 -RUN export RTRLIB_VERSION="0.6.3" && \ +RUN export RTRLIB_VERSION="0.6.3" && export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \ wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \ tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \ cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \ - dpkg -i ../librtr*_$(dpkg-architecture -qDEB_HOST_ARCH).deb ../librtr*_all.deb + dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb # 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 && \ + > /etc/apt/sources.list.d/bullseye.list && \ apt-get update && apt-get install -y -t bullseye \ libyang-dev \ libyang1; \ - rm -f /etc/apt/sources.list.d/bullseye-backports.list + rm -f /etc/apt/sources.list.d/bullseye.list # Packages needed to build FRR itself # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst |