Update devel packages piecemeal so that openssl isn't updated

mhart · mhart · commit 3d4ce51dceed · 2019-02-01T16:00:40.000-05:00
Fixes lambci#163
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -23,7 +23,7 @@ ENV PATH=/usr/local/bin:/usr/bin/:/bin:/opt/bin \
     AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
     _X_AMZN_TRACE_ID='Parent=11560be54abce8ed'
 
-RUN yum reinstall -y --releasever=latest filesystem; \
+RUN yum reinstall -y filesystem; \
   rm -rf /var/cache/yum /var/lib/rpm/__db.* && \
   > /var/log/yum.log && \
   mkdir /tmp && \
diff --git a/base/build/Dockerfile b/base/build/Dockerfile
@@ -16,16 +16,18 @@ f.close();" && \
   rpm --rebuilddb && \
   yum install -y --releasever=latest yum-plugin-ovl && \
   yum reinstall -y --releasever=latest setup pam shadow-utils audit-libs glibc glibc-common iptables fipscheck-lib && \
-  rm -rf /var/cache/yum && \
+  yum clean all && \
   yum reinstall -y openssl openssh-clients && \
-  rm -rf /var/cache/yum && \
+  yum clean all && \
   yum install -y --releasever=latest glibc-devel && \
-  yum groupinstall -y --releasever=latest development && \
-  yum install -y --releasever=latest clang cmake docker \
-    libssh2-devel libffi-devel python27-devel python34-devel \
-    libmpc-devel mpfr-devel gmp-devel pcre-devel cairo-devel ImageMagick-devel \
-    libcurl-devel expat-devel libicu-devel libxml2-devel libxslt-devel lua-devel \
-    ncurses-devel readline-devel db4-devel gdbm-devel sqlite-devel && \
+  yum clean all && \
+  yum groupinstall -y development && \
+  yum install -y clang cmake docker libffi-devel python27-devel python34-devel \
+    libmpc-devel mpfr-devel gmp-devel cairo-devel expat-devel libicu-devel lua-devel \
+    ncurses-devel readline-devel db4-devel gdbm-devel sqlite-devel keyutils-libs-devel libcom_err-devel && \
+  yum clean all && \
+  yum install -y --releasever=latest pcre-devel ImageMagick-devel libxml2-devel libxslt-devel libcurl-devel krb5-devel && \
+  yum clean all && \
+  yum install -y libssh2-devel && \
   rm -rf /var/cache/yum /var/lib/rpm/__db.* && \
   > /var/log/yum.log
-
diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile
@@ -9,7 +9,7 @@ ENV PATH=/var/lang/bin:$PATH \
 
 RUN rm -rf /var/runtime /var/lang && \
   curl https://lambci.s3.amazonaws.com/fs/dotnetcore2.0.tgz | tar -zx -C / && \
-  yum install -y --releasever=latest libunwind && \
+  yum install -y libunwind && \
   curl https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VERSION -i /var/lang/bin && \
   mkdir /tmp/warmup && \
   cd /tmp/warmup && \
diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile
@@ -9,7 +9,7 @@ ENV PATH=/var/lang/bin:$PATH \
 
 RUN rm -rf /var/runtime /var/lang && \
   curl https://lambci.s3.amazonaws.com/fs/dotnetcore2.1.tgz | tar -zx -C / && \
-  yum install -y --releasever=latest libunwind && \
+  yum install -y libunwind && \
   curl https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VERSION -i /var/lang/bin && \
   mkdir /tmp/warmup && \
   cd /tmp/warmup && \
diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile
@@ -8,7 +8,6 @@ ENV PATH=/var/lang/bin:$PATH \
 
 RUN rm -rf /var/runtime /var/lang && \
   curl https://lambci.s3.amazonaws.com/fs/python3.6.tgz | tar -xz -C / && \
-  yum install -y --releasever=latest bzip2-devel && \
   sed -i '/^prefix=/c\prefix=/var/lang' /var/lang/lib/pkgconfig/python-3.6.pc && \
   curl https://www.python.org/ftp/python/3.6.8/Python-3.6.8.tar.xz | tar -xJ && \
   cd Python-3.6.8 && \
