diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6 index a70520a..d19efe1 100644 --- a/builder/Dockerfile.centos-6 +++ b/builder/Dockerfile.centos-6 @@ -3,6 +3,7 @@ FROM centos:centos6 ENV OS_IDENTIFIER centos-6 RUN yum -y update \ + && yum -y install epel-release \ && yum -y install \ bzip2-devel \ cairo-devel \ @@ -34,8 +35,10 @@ RUN yum -y update \ openssl-devel \ pango-devel \ pcre-devel \ + pcre2-devel \ pkgconfig \ python \ + python-pip \ readline-devel \ rpm-build \ stunnel \ @@ -49,10 +52,6 @@ RUN yum -y update \ zlib-devel \ && yum clean all -# Install pip -RUN yum install -y epel-release && \ - yum install -y python-pip - # Install AWS CLI. RUN pip install awscli --upgrade --user && \ ln -s /root/.local/bin/aws /usr/bin/aws diff --git a/builder/Dockerfile.debian-9 b/builder/Dockerfile.debian-9 index 63b8c23..d7ef735 100644 --- a/builder/Dockerfile.debian-9 +++ b/builder/Dockerfile.debian-9 @@ -7,7 +7,7 @@ RUN set -x \ && echo 'deb-src http://deb.debian.org/debian stretch main' >> /etc/apt/sources.list \ && apt-get update \ && apt-get install -y gcc libcurl4-openssl-dev libicu-dev \ - libopenblas-base make python-pip ruby ruby-dev wget \ + libopenblas-base libpcre2-dev make python-pip ruby ruby-dev wget \ && apt-get build-dep -y r-base RUN pip install awscli diff --git a/builder/Dockerfile.opensuse-15 b/builder/Dockerfile.opensuse-15 index ba082f3..b0bccd0 100644 --- a/builder/Dockerfile.opensuse-15 +++ b/builder/Dockerfile.opensuse-15 @@ -31,6 +31,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ make \ pango-devel \ pcre-devel \ + pcre2-devel \ perl \ perl-macros \ python \ diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42 index 2172122..5f0c77b 100644 --- a/builder/Dockerfile.opensuse-42 +++ b/builder/Dockerfile.opensuse-42 @@ -32,6 +32,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ make \ pango-devel \ pcre-devel \ + pcre2-devel \ perl \ perl-macros \ python \ diff --git a/builder/package.debian-9 b/builder/package.debian-9 index eb536bf..ee90933 100644 --- a/builder/package.debian-9 +++ b/builder/package.debian-9 @@ -33,6 +33,7 @@ fpm \ -d libpango-1.0-0 \ -d libpangocairo-1.0-0 \ -d libpaper-utils \ + -d libpcre2-8-0 \ -d libpcre3 \ -d libpng16-16 \ -d libreadline7 \ diff --git a/builder/package.opensuse-15 b/builder/package.opensuse-15 index db01d67..834a8a9 100644 --- a/builder/package.opensuse-15 +++ b/builder/package.opensuse-15 @@ -51,6 +51,7 @@ fpm \ -d make \ -d openblas-devel \ -d pcre-devel \ + -d pcre2-devel \ -d tar \ -d tcl \ -d tk \ diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42 index 5bf8221..4ee631d 100644 --- a/builder/package.opensuse-42 +++ b/builder/package.opensuse-42 @@ -49,6 +49,7 @@ fpm \ -d make \ -d openblas-devel \ -d pcre-devel \ + -d pcre2-devel \ -d tar \ -d tcl \ -d tk \