summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2021-02-28 05:28:11 +0200
committerDaniil Baturin <daniil@vyos.io>2021-02-28 05:28:11 +0200
commit39ab069e421c6e3a4381e6782feebe0a89e15c12 (patch)
treec5ce18ccafd777f21a351614406d2a0a5984de78 /docker
parent430084797b21873b342aa81c80f893f2329f5d49 (diff)
downloadvyos-build-39ab069e421c6e3a4381e6782feebe0a89e15c12.tar.gz
vyos-build-39ab069e421c6e3a4381e6782feebe0a89e15c12.zip
Move OCaml version to a variable and update to the latest 4.12
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 92e6aad9..8a86afba 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -58,6 +58,8 @@ RUN apt-get update && apt-get install -y \
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen
ENV LANG en_US.utf8
+ENV OCAML_VERSION 4.12.0
+
RUN apt-get update && apt-get install -y \
vim \
vim-autopep8 \
@@ -119,7 +121,7 @@ RUN dpkg-reconfigure ca-certificates; \
RUN curl https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh \
--output /tmp/opam_install.sh --retry 10 --retry-delay 5 && \
sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \
- opam init --root=/opt/opam --comp=4.09.1 --disable-sandboxing --no-setup
+ opam init --root=/opt/opam --comp=${OCAML_VERSION} --disable-sandboxing --no-setup
RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
pcre re