From f6ee456a55d4e2a8941b7870a7f7cca1e14ddf23 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Wed, 15 Nov 2017 16:56:01 -0700 Subject: [PATCH] dockerfile dep cleanup --- build/awips-ade/Dockerfile.awips-ade.el6 | 6 ++---- build/awips-ade/Dockerfile.awips-ade.el7 | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/awips-ade/Dockerfile.awips-ade.el6 b/build/awips-ade/Dockerfile.awips-ade.el6 index a8a5d2becc..eab27c1e68 100644 --- a/build/awips-ade/Dockerfile.awips-ade.el6 +++ b/build/awips-ade/Dockerfile.awips-ade.el6 @@ -13,12 +13,10 @@ RUN yum groupinstall "Development tools" -y RUN yum install epel-release -y RUN yum clean all -y -#RUN yum install wget rsync git net-tools bc -y - -ENV systemDeps="wget rsync git net-tools bc" +ENV systemDeps="wget rsync git net-tools" ENV rpmDeps="gcc gcc-c++ rpm-build readline-devel createrepo" ENV qpidDeps="boost-devel cmake make ruby libuuid-devel" -ENV pythonDeps="tk-devel tcl-devel atlas-devel compat-libf2c-34(x86-64) libgfortran(x86-64) geos libpng-devel freetype" +ENV pythonDeps="tk-devel tcl-devel atlas-devel compat-libf2c-34 libgfortran geos libpng-devel freetype" ENV awipsDeps="netcdf netcdf-devel hdf5-devel lzo-devel bzip2-devel qt-devel" ENV httpDeps="autoconf findutils libselinux-devel libxml2-devel lua-devel openldap-devel openssl-devel pcre-devel pkgconfig perl zlib-devel apr-util-devel apr-devel" diff --git a/build/awips-ade/Dockerfile.awips-ade.el7 b/build/awips-ade/Dockerfile.awips-ade.el7 index ebba5c677e..25d36fab9c 100644 --- a/build/awips-ade/Dockerfile.awips-ade.el7 +++ b/build/awips-ade/Dockerfile.awips-ade.el7 @@ -13,10 +13,10 @@ RUN yum groupinstall "Development tools" -y RUN yum install epel-release -y RUN yum clean all -y -ENV systemDeps="wget rsync git net-tools bc" +ENV systemDeps="wget rsync git net-tools" ENV rpmDeps="gcc gcc-c++ rpm-build readline-devel createrepo" ENV qpidDeps="boost-devel cmake make ruby libuuid-devel" -ENV pythonDeps="tk-devel tcl-devel atlas-devel compat-libf2c-34(x86-64) libgfortran(x86-64) geos libpng-devel freetype" +ENV pythonDeps="tk-devel tcl-devel atlas-devel compat-libf2c-34 libgfortran geos libpng-devel freetype" ENV awipsDeps="netcdf netcdf-devel hdf5-devel lzo-devel bzip2-devel qt-devel" ENV httpDeps="autoconf findutils libselinux-devel libxml2-devel lua-devel openldap-devel openssl-devel pcre-devel pkgconfig perl zlib-devel apr-util-devel apr-devel"