diff --git a/build/awips-ade/Dockerfile.awips-ade.el6 b/build/awips-ade/Dockerfile.awips-ade.el6 index f18b177ff6..55d150b0a7 100644 --- a/build/awips-ade/Dockerfile.awips-ade.el6 +++ b/build/awips-ade/Dockerfile.awips-ade.el6 @@ -1,6 +1,6 @@ FROM unidata/awips-devel:el6 ENV VERSION 18.1.1 -ENV RELEASE 1 +ENV RELEASE 6 MAINTAINER Michael James USER root diff --git a/build/awips-ade/Dockerfile.awips-ade.el7 b/build/awips-ade/Dockerfile.awips-ade.el7 index 34c4113720..87b3c5069d 100644 --- a/build/awips-ade/Dockerfile.awips-ade.el7 +++ b/build/awips-ade/Dockerfile.awips-ade.el7 @@ -1,6 +1,6 @@ FROM unidata/awips-devel:el7 ENV VERSION 18.1.1 -ENV RELEASE 1 +ENV RELEASE 6 MAINTAINER Michael James USER root diff --git a/build/awips-ade/Dockerfile.awips-devel.el6 b/build/awips-ade/Dockerfile.awips-devel.el6 index 6202e2baa8..15d50e5a7d 100644 --- a/build/awips-ade/Dockerfile.awips-devel.el6 +++ b/build/awips-ade/Dockerfile.awips-devel.el6 @@ -1,6 +1,6 @@ FROM centos:6 ENV VERSION 18.1.1 -ENV RELEASE 1 +ENV RELEASE 6 MAINTAINER Michael James USER root @@ -10,11 +10,11 @@ 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 systemDeps="wget rsync git net-tools gzip libtool" +ENV rpmDeps="gcc gcc-c++ glibc-devel 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 awipsDeps="netcdf netcdf-devel hdf5-devel lzo-devel bzip2-devel qt-devel xz-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 diff --git a/build/awips-ade/Dockerfile.awips-devel.el7 b/build/awips-ade/Dockerfile.awips-devel.el7 index de8086575b..cb5c8b0009 100644 --- a/build/awips-ade/Dockerfile.awips-devel.el7 +++ b/build/awips-ade/Dockerfile.awips-devel.el7 @@ -1,6 +1,6 @@ FROM centos:7 ENV VERSION 18.1.1 -ENV RELEASE 1 +ENV RELEASE 6 MAINTAINER Michael James USER root @@ -11,11 +11,11 @@ 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 systemDeps="wget rsync git net-tools gzip libtool" +ENV rpmDeps="gcc gcc-c++ glibc-devel 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 awipsDeps="netcdf netcdf-devel hdf5-devel lzo-devel bzip2-devel qt-devel xz-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 diff --git a/build/awips-ade/awips-devel.sh b/build/awips-ade/awips-devel.sh index f93fbbaccf..32b32dc508 100755 --- a/build/awips-ade/awips-devel.sh +++ b/build/awips-ade/awips-devel.sh @@ -20,4 +20,4 @@ sudo docker build -t unidata/${img} -f Dockerfile.${img}.${os_version} . dockerID=$(sudo docker images | grep ${img} | grep latest | awk '{print $3}' | head -1 ) sudo docker tag $dockerID unidata/${img}:${os_version} sudo docker rmi unidata/${img}:latest -#sudo docker push unidata/${img} +sudo docker push unidata/${img} diff --git a/build/awips-ade/el6-dev.repo b/build/awips-ade/el6-dev.repo index dad863b1f7..46ff31220d 100644 --- a/build/awips-ade/el6-dev.repo +++ b/build/awips-ade/el6-dev.repo @@ -1,6 +1,6 @@ [awips2repo] name=AWIPS II Repository -baseurl=http://www.unidata.ucar.edu/repos/yum/el6-dev/ +baseurl=https://www.unidata.ucar.edu/repos/yum/el6-dev/ enabled=1 protect=0 gpgcheck=0 diff --git a/build/buildEnvironment.sh b/build/buildEnvironment.sh index 45333ccdfe..2a0eff2ee3 100755 --- a/build/buildEnvironment.sh +++ b/build/buildEnvironment.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version export AWIPSII_VERSION="18.1.1" -export AWIPSII_RELEASE="5" +export AWIPSII_RELEASE="6" # Author export AWIPSII_BUILD_VENDOR="UCAR" export AWIPSII_BUILD_SITE="Unidata" diff --git a/dist/comps.xml b/dist/comps.xml index 7c93ae540d..ea9cd32dd1 100644 --- a/dist/comps.xml +++ b/dist/comps.xml @@ -11,7 +11,6 @@ awips2-eclipse awips2-ant awips2-groovy - awips2-ldm awips2-python awips2-python-cython awips2-python-dateutil @@ -45,7 +44,6 @@ awips2-qpid-java-broker awips2-qpid-lib awips2-localization - awips2-ldm awips2-tools awips2-maps-database awips2-data.hdf5-topo