diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-01-26 22:08:03 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-01-26 22:08:03 +0100 |
| commit | 5c71eee90b61dbddaf54bd49b79c541587d8fa6f (patch) | |
| tree | 9e954eddae3f5818b99827475fae602a5d22855f /docker/Dockerfile | |
| parent | c268053839010c5abbef223498a71a5ecce8a632 (diff) | |
| parent | 4d073e64d0b9ee61d30592b8b324560da08c31c2 (diff) | |
| download | vyos-build-5c71eee90b61dbddaf54bd49b79c541587d8fa6f.tar.gz vyos-build-5c71eee90b61dbddaf54bd49b79c541587d8fa6f.zip | |
Merge branch 'source-build' of github.com:c-po/vyos-build into current
* 'source-build' of github.com:c-po/vyos-build:
build-submodules: ease FRR build procedure
build-kernel: no need to build source and debug package
Remove wrong vyos-xe-guest-utilities submodule in root folder
Docker: build libyang Debian package
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b874bf92..bca48ff8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -150,11 +150,16 @@ RUN export RTRLIB_COMMIT="v0.6.3" && \ # Prerequisites for building FRR from source # see http://docs.frrouting.org/projects/dev-guide/en/latest/building-frr-for-debian8.html # -RUN export LIBYANG_COMMIT="v0.16-r2" && \ - git clone https://github.com/CESNET/libyang.git && \ +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 -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr .. && \ - make && make install + cmake .. && make build-deb && \ + dpkg -i debs/*.deb # Packages needed for frr RUN apt-get update && apt-get install -y \ |