diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-01-31 21:20:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-31 21:20:01 +0100 |
| commit | 439743ef25bfafc8e2a0a8350a0a57f9a93a3bae (patch) | |
| tree | cf3349e869abc9cd857e0b6681455f5ff82279fc | |
| parent | 09ec7740dca79e159b9e319c6ffbe61e880eb177 (diff) | |
| parent | c26f9f9309d3dad0fb344a4691a97a00d39a4b28 (diff) | |
| download | vyos-build-439743ef25bfafc8e2a0a8350a0a57f9a93a3bae.tar.gz vyos-build-439743ef25bfafc8e2a0a8350a0a57f9a93a3bae.zip | |
Merge pull request #301 from jestabro/pin-pcre-no-jit
Docker: T4970: pin OCaml pcre package to avoid JIT support
| -rw-r--r-- | docker/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8a7720ae..e90338cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -127,8 +127,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=${OCAML_VERSION} --disable-sandboxing --no-setup +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 \ |