Merge pull request #1 from rstudio/jon/no-epel

Remove EPEL Dependency

builder/Dockerfile.centos-6

@@ -2,10 +2,6 @@ FROM centos:centos6
 
 ENV OS_IDENTIFIER centos-6
 
-RUN yum -y update \
-    && yum -y install epel-release \
-    && yum clean all
-
 RUN yum -y update \
     && yum -y install \
     atlas-devel \
@@ -31,7 +27,6 @@ RUN yum -y update \
     libicu-devel \
     libidn-devel \
     libjpeg-devel \
-    libmetalink-devel \
     libpng-devel \
     libssh2-devel \
     libtiff-devel \
@@ -43,14 +38,11 @@ RUN yum -y update \
     openssl-devel \
     pango-devel \
     pcre-devel \
-    pcre2-devel \
     pkgconfig \
     python \
-    python-pip \
     readline-devel \
     stunnel \
     tcl-devel \
-    tex \
     texinfo-tex \
     texlive-latex \
     tk-devel \
@@ -60,7 +52,13 @@ RUN yum -y update \
     zlib-devel \
     && yum clean all
 
-RUN pip install awscli
+# Install pip
+RUN curl "https://bootstrap.pypa.io/2.6/get-pip.py" -o "get-pip.py" && \
+    python get-pip.py
+
+# Install AWS CLI.
+RUN pip install awscli --upgrade --user && \
+    ln -s /root/.local/bin/aws /usr/bin/aws
 
 RUN chmod 0777 /opt
 
@@ -168,7 +166,7 @@ RUN curl -fsSL "https://curl.haxx.se/download/curl-{$CURL_VERSION}.tar.gz" -o cu
     && CWD=`pwd` && TMP=`mktemp -d` \
     && tar -C $TMP -zxvf curl.tar.gz \
     && cd $TMP/curl* \
-    && CFLAGS="-fpic -fPIC" ./configure --enable-static=yes --enable-shared=no --with-ssl --enable-ipv6 --with-gssapi --with-libidn --enable-ldaps --with-libssh2 --enable-threaded-resolver --with-libmetalink --prefix=/tmp/extra \
+    && CFLAGS="-fpic -fPIC" ./configure --enable-static=yes --enable-shared=no --with-ssl --enable-ipv6 --with-gssapi --with-libidn --enable-ldaps --with-libssh2 --enable-threaded-resolver --prefix=/tmp/extra \
     && make V=1 \
     && make install \
     && cd $CWD && rm -rf $TMP && rm -rf curl.tar.gz

builder/Dockerfile.centos-7

@@ -2,10 +2,6 @@ FROM centos:centos7
 
 ENV OS_IDENTIFIER centos-7
 
-RUN yum -y update \
-    && yum -y install epel-release \
-    && yum clean all
-
 RUN yum -y update \
     && yum -y install \
     atlas-devel \
@@ -34,26 +30,29 @@ RUN yum -y update \
     libtool \
     make \
     ncurses-devel \
-    openblas-devel \
     pango-devel \
     pcre-devel \
     pcre2-devel \
-    python-pip \
     readline-devel \
     tcl-devel \
     tex \
     texinfo-tex \
     texlive-collection-latexrecommended \
     tk-devel \
-    tre-devel \
     valgrind-devel \
+    which \
     wget \
-    xpdf \
     xz-devel \
     zlib-devel \
     && yum clean all
 
-RUN pip install awscli
+# Install pip for python
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+    python get-pip.py
+
+# Install AWS CLI.
+RUN pip install awscli --upgrade --user && \
+    ln -s /root/.local/bin/aws /usr/bin/aws
 
 RUN chmod 0777 /opt
 
@@ -67,8 +66,7 @@ ENV CONFIGURE_OPTIONS="\
     --with-tcl-config=/usr/lib64/tclConfig.sh \
     --with-tk-config=/usr/lib64/tkConfig.sh \
     --enable-BLAS-shlib \
-    --enable-prebuilt-html \
-    --with-system-tre"
+    --enable-prebuilt-html"
 
 # RHEL 7 doesn't have the inconsolata font, so override the defaults.
 ENV R_RD4PDF="times,hyper"