awips-ade docker build revamp

build/README.md

@@ -6,7 +6,7 @@
 
 We create and use the Docker image unidata/awips-ade to build the two RHEL binary distributions of AWIPS (RPMS). The directory **awips2-builds/build/awips-ade/** contains Dockerfiles for 64-bit EL6 and EL7 CentOS.
 
-    ./build/awips-ade/docker_build.sh ${os_version}
+    ./build/awips-ade/awips-ade.sh ${os_version}
 
 where **${os_version}** is either *el6* or *el7*.
 

build/awips-ade/Dockerfile.awips-ade.el7

@@ -1,27 +1,12 @@
-FROM awips-devel:el7
+FROM unidata/awips-devel:el7
 ENV VERSION 18.1.1
 ENV RELEASE 1
 MAINTAINER Michael James <mjames@ucar.edu>
 
 USER root
 
-RUN yum update yum -y
-
 RUN groupadd fxalpha && useradd -G fxalpha awips
 
-RUN yum groupinstall "Development tools" -y
-RUN yum install epel-release -y
-RUN yum clean all -y
-
-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 libgfortran geos-devel 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"
-
-RUN yum install $systemDeps $rpmDeps $qpidDeps $pythonDeps $awipsDeps $httpDeps -y
-
 RUN wget -O /etc/yum.repos.d/awips2.repo https://www.unidata.ucar.edu/software/awips2/doc/el7-dev.repo
 RUN yum -y clean all
 RUN yum groupinstall awips2-ade -y

build/awips-ade/Dockerfile.awips-devel.el7

@@ -0,0 +1,23 @@
+FROM centos:7
+ENV VERSION 18.1.1
+ENV RELEASE 1
+MAINTAINER Michael James <mjames@ucar.edu>
+
+USER root
+
+RUN yum update yum -y
+
+RUN yum groupinstall "Development tools" -y
+RUN yum install epel-release -y
+RUN yum clean all -y
+
+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 libgfortran geos-devel 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"
+
+RUN yum install $systemDeps $rpmDeps $qpidDeps $pythonDeps $awipsDeps $httpDeps -y
+
+ENTRYPOINT ["/bin/bash"]