diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-05-13 15:30:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-13 15:30:55 +0100 |
| commit | 1cf889b0585daafee03149a128937f3bfa20665f (patch) | |
| tree | d47f4166101dd3fb990a38aceede2831ece15924 | |
| parent | 5891a5bd25bf6556b7aa8dea014fcddc00c57149 (diff) | |
| parent | cae7cd90e028c564a4f9250354855763a690bcf8 (diff) | |
| download | vyos-build-1cf889b0585daafee03149a128937f3bfa20665f.tar.gz vyos-build-1cf889b0585daafee03149a128937f3bfa20665f.zip | |
Merge pull request #964 from dmbaturin/T7450-use-pcre2
docker: T7450: use PCRE2 for vyos-utils and libvyosconfig
| -rw-r--r-- | docker/Dockerfile | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 1b73ca66..bf160f9d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -124,9 +124,10 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \ # Building libvyosconf requires a full configured OPAM/OCaml setup RUN apt-get update && apt-get install -y \ + quilt \ debhelper \ libffi-dev \ - libpcre3-dev \ + libpcre2-dev \ unzip # Update certificate store to not crash ocaml package install @@ -136,17 +137,15 @@ RUN dpkg-reconfigure ca-certificates; \ echo "cacert=/etc/ssl/certs/ca-certificates.crt" >> ~/.curlrc; \ fi -# Installing OCAML needed to compile libvyosconfig +# Installing OCaml needed to compile libvyosconfig RUN curl https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh \ --output /tmp/opam_install.sh --retry 10 --retry-delay 5 && \ sed -i 's/read_tty 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 \ re \ + pcre2 \ num \ ctypes \ ctypes-foreign \ @@ -155,12 +154,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ fileutils \ xml-light -# Packages needed for libvyosconfig -RUN apt-get update && apt-get install -y \ - quilt \ - libpcre3-dev \ - libffi-dev - # Packages needed for open-vmdk RUN apt-get update && apt-get install -y \ zlib1g-dev |