summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2019-11-07 13:42:27 +0100
committerKim Hagen <kim.sidney@gmail.com>2019-11-07 13:42:27 +0100
commit1f156d862c8d9afb9d45077afaf162c3b37cb712 (patch)
tree733e07a60954da5f47916aeac0686e798c497c51 /docker
parentc65f9d7b48587a1e5dfb4fd226a0a731a94b7f57 (diff)
parent165e447b6c57cb9f376ea8f0d991f11ca7efb30e (diff)
downloadvyos-build-1f156d862c8d9afb9d45077afaf162c3b37cb712.tar.gz
vyos-build-1f156d862c8d9afb9d45077afaf162c3b37cb712.zip
Merge branch 'crux' of github.com:vyos/vyos-build into crux
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile30
1 files changed, 7 insertions, 23 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3befeea0..b9fdae85 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -98,40 +98,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