diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-18 20:31:14 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-18 20:31:14 +0100 |
| commit | c90d376ecccf8bb0d8dcf3cfad2a86a32a0d095f (patch) | |
| tree | 6876924b73617ee31b5a1e0d321644bbfd9a2a19 /docker | |
| parent | f2d457a9ed089995783207574699ec98c6956291 (diff) | |
| download | vyos-build-c90d376ecccf8bb0d8dcf3cfad2a86a32a0d095f.tar.gz vyos-build-c90d376ecccf8bb0d8dcf3cfad2a86a32a0d095f.zip | |
Revert "Docker: build libyang from source"
This reverts commit f2d457a9ed089995783207574699ec98c6956291.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 2765fe47..7394434a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -173,7 +173,7 @@ RUN apt-get update && apt-get install -y \ # Packages needed for vyos-qat RUN apt-get update && apt-get install -y \ libboost-dev \ - libudev-dev + libudev-dev # Prerequisites for building rtrlib # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html @@ -198,19 +198,13 @@ RUN apt-key add /tmp/vyos-dev.key RUN echo "deb http://dev.packages.vyos.net/repositories/crux/debian/ crux main" \ > /etc/apt/sources.list.d/vyos.list -RUN export LIBYANG_COMMIT="179da47f2e8def1907372408a9df97a0dcbc1347" && \ - wget -P /tmp https://github.com/opensourcerouting/libyang/archive/${LIBYANG_COMMIT}.tar.gz && \ - tar xf /tmp/${LIBYANG_COMMIT}.tar.gz && \ - cd libyang-${LIBYANG_COMMIT} && \ - mkdir build && cd build && \ - cmake .. && make build-deb && \ - dpkg -i debs/*.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 \ |