summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-01-31 11:13:27 -0600
committerJohn Estabrook <jestabro@vyos.io>2023-01-31 15:20:55 -0600
commit08fe12d735f4543bddb2ef3f23f29ff36501a9ff (patch)
tree7a03ac3867f59f193ae1a30d2c1403d7c8baeb93
parentff075708b1c527710804bbf096fa81e52aad9363 (diff)
downloadvyos-build-08fe12d735f4543bddb2ef3f23f29ff36501a9ff.tar.gz
vyos-build-08fe12d735f4543bddb2ef3f23f29ff36501a9ff.zip
Docker: T4970: pin OCaml pcre package to avoid JIT support
(cherry picked from commit c26f9f9309d3dad0fb344a4691a97a00d39a4b28)
-rw-r--r--docker/Dockerfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f0a000c5..350ba5f5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -126,8 +126,11 @@ RUN curl https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh \
sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \
opam init --root=/opt/opam --comp=4.12.0 --disable-sandboxing
+RUN eval $(opam env --root=/opt/opam --set-root) && \
+ opam pin add pcre https://github.com/mmottl/pcre-ocaml.git#0c4ca03a -y
+
RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
- pcre re
+ re
RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
num \