diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-01-26 05:10:04 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 05:10:04 +0700 |
| commit | aa2bff5ff5cedb3979f3677a5d45fd029db61a20 (patch) | |
| tree | e77d11f3ea43d38a937bd3b7ec8f22e4372e0a72 | |
| parent | 7a67b6b8bbb2bd8c03b3c3245bdd37065ad35bd2 (diff) | |
| download | vyos-build-aa2bff5ff5cedb3979f3677a5d45fd029db61a20.tar.gz vyos-build-aa2bff5ff5cedb3979f3677a5d45fd029db61a20.zip | |
Install Menhir with opam and use an opam pin for installing vyconf
Quite a bit shorter than running the whole vyconf build sequence by hand.
| -rw-r--r-- | docker/Dockerfile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index d951a8ff..e77cb540 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -208,7 +208,8 @@ RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --o xml-light \ batteries \ ocaml-protoc \ - ctypes-foreign + ctypes-foreign \ + menhir RUN eval $(opam env) && opam install -y \ ctypes @@ -218,11 +219,7 @@ RUN eval $(opam env) && \ git clone https://github.com/vyos/vyconf.git && \ cd vyconf && \ git checkout 0f121c12a84200 && \ - ./build-setup.sh && \ - ./configure --enable-tests && \ - make && \ - make test && \ - make install + opam pin add vyconf. # Build libvyosconfig RUN eval $(opam env) && \ |