summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-05-27 09:44:48 +0200
committerGitHub <noreply@github.com>2024-05-27 09:44:48 +0200
commitebacf8daba03aaba241769e26b3e091ef9266f0b (patch)
treedcaa94a9092f857cd47fed23f3ede84da621702b
parent96c70b0a0bb0f7f27ecedc00ff2cce1c7ebc4c5b (diff)
parente92a7ed51949d7cd6703b9f22d3929858264c119 (diff)
downloadvyos-build-ebacf8daba03aaba241769e26b3e091ef9266f0b.tar.gz
vyos-build-ebacf8daba03aaba241769e26b3e091ef9266f0b.zip
Merge pull request #642 from vyos/mergify/bp/sagitta/pr-641
T6404: update vyos1x-config commit reference (backport #641)
-rw-r--r--docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b7b152e7..48aec028 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 \