summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authordd <91662885+dd010101@users.noreply.github.com>2024-05-28 07:02:05 +0200
committerGitHub <noreply@github.com>2024-05-28 07:02:05 +0200
commitaf3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8 (patch)
tree980a236b40fdd7203a90785e6b0e66d8840f2e36 /docker
parentd741d57b4beeaf63f94a4b3590ebc7c2db6dd0f1 (diff)
parent1f7bb741aab73072e03d72d1fead0e2294c43845 (diff)
downloadvyos-build-af3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8.tar.gz
vyos-build-af3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8.zip
Merge branch 'vyos:sagitta' into sagitta
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0f36cc45..f700fd20 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -62,7 +62,7 @@ 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
+ENV OCAML_VERSION 4.14.2
# Base packaged needed to build packages and their package dependencies
RUN apt-get update && apt-get install -y \
@@ -150,7 +150,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
# Build VyConf which is required to build libvyosconfig
RUN eval $(opam env --root=/opt/opam --set-root) && \
- opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#8c65eb12 -y
+ opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#b7f104781 -y
# Packages needed for libvyosconfig
RUN apt-get update && apt-get install -y \