Merge pull request #56 from rstudio/glin/r4

Add R 4.0 support for CentOS 6, Debian, SUSE

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

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

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 \

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 \

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 \

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 \

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 \