diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-02-01 00:25:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 00:25:40 +0000 |
| commit | 3da60940f8229c14c63f2a12b7b8d2d61280f57b (patch) | |
| tree | 7a03ac3867f59f193ae1a30d2c1403d7c8baeb93 | |
| parent | ff075708b1c527710804bbf096fa81e52aad9363 (diff) | |
| parent | 08fe12d735f4543bddb2ef3f23f29ff36501a9ff (diff) | |
| download | vyos-build-3da60940f8229c14c63f2a12b7b8d2d61280f57b.tar.gz vyos-build-3da60940f8229c14c63f2a12b7b8d2d61280f57b.zip | |
Merge pull request #303 from jestabro/equuleus-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 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 \ |