diff options
| author | John Estabrook <jestabro@sentrium.io> | 2019-10-28 13:44:47 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@sentrium.io> | 2019-10-29 09:57:11 -0500 |
| commit | 529220d610a6cf327b5543a5fd06fc819cded88f (patch) | |
| tree | bae3551414f816babd14a1934485bc4dddd8c882 /docker | |
| parent | 4b61416f466846f5dfedd4194a1d6a7f590b9850 (diff) | |
| download | vyos-build-529220d610a6cf327b5543a5fd06fc819cded88f.tar.gz vyos-build-529220d610a6cf327b5543a5fd06fc819cded88f.zip | |
T1773: update Dockerfile for changes to libvyosconfig
(cherry-pick from current bdce9244ff9acc57bf04a6c922cc78787aaa8174)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index dfb4a35a..6a09ae43 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -85,40 +85,24 @@ RUN apt-get update && apt-get install -y \ RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --output /tmp/opam_install.sh && \ sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \ - opam init --root=/opt/opam --comp=4.07.0 --disable-sandboxing - -RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam install -y \ - oasis + opam init --root=/opt/opam --comp=4.08.0 --disable-sandboxing RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - fileutils \ - lwt \ - lwt_ppx \ - lwt_log \ - ocplib-endian \ - ounit \ - pcre \ - ppx_deriving_yojson \ - sha \ - toml \ - xml-light \ - batteries \ - ocaml-protoc \ - ctypes-foreign \ - menhir + pcre RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ - ctypes + ctypes \ + ctypes-foreign \ + ctypes-build # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyconf https://github.com/vyos/vyconf.git#51d79a3f -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#550048b3 -y # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git && \ - cd libvyosconfig && git checkout 9a80a5d3 && \ + cd libvyosconfig && git checkout 5138b5eb && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb |