cave p2 build, docker builds, repo comps update for 17.1.1-4

build/awips-ade/docker_build.sh

@@ -5,12 +5,12 @@ if [ -z "$1" ]; then
 fi
 os_version=$1
 
-existing=$(sudo docker images |grep awips-ade | awk '{ print $3 }'|uniq)
+existing=$(sudo docker images |grep awips-ade | grep $1 | awk '{ print $3 }')
 if [ ! -z "$existing" ]; then
    sudo docker rmi $existing
 fi
 pushd /awips2/repo/awips2-builds/build/awips-ade
 sudo docker build -t unidata/awips-ade -f Dockerfile.awips-ade.${os_version} .
-dockerID=$(sudo docker ps | grep awips-ade | awk '{print $1}' | head -1 )
+dockerID=$(sudo docker images | grep awips-ade | awk '{print $3}' | head -1 )
 sudo docker tag $dockerID unidata/awips-ade:17.1.1-${os_version} 
 sudo docker push unidata/awips-ade

build/comps.xml

@@ -11,6 +11,7 @@
          <packagereq type="default">awips2-eclipse</packagereq>
          <packagereq type="default">awips2-ant</packagereq>
          <packagereq type="default">awips2-groovy</packagereq>
+         <packagereq type="default">awips2-ldm</packagereq>
          <packagereq type="default">awips2-python</packagereq>
          <packagereq type="default">awips2-python-cython</packagereq>
          <packagereq type="default">awips2-python-dateutil</packagereq>
@@ -99,7 +100,6 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
-         <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
@@ -155,7 +155,6 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
-         <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
@@ -214,7 +213,6 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
-         <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
@@ -249,7 +247,6 @@
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
-         <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>

build/package_deps.txt

@@ -1,67 +0,0 @@
-# All BuildRequires
-#    httpd-pypies autoconf
-#    httpd-pypies findutils
-#    httpd-pypies libselinux-devel
-#    httpd-pypies libuuid-devel
-#    httpd-pypies libxml2-devel
-#    httpd-pypies lua-devel
-#    httpd-pypies openldap-devel
-#    httpd-pypies openssl-devel
-#    httpd-pypies pcre-devel
-#    httpd-pypies perl
-#    httpd-pypies pkgconfig
-#    httpd-pypies zlib-devel
-#      postgresql openssl-devel
-#        qpid-lib boost-devel
-#        qpid-lib cmake
-#        qpid-lib libuuid-devel
-#        qpid-lib make
-#        qpid-lib ruby
-#          python tk-devel
-#          python tcl-devel
-#          python libgfortran
-#           numpy atlas-devel
-#           numpy compat-libf2c-34
-#           numpy libgfortran
-#            h5py awips2-python-numpy
-#            h5py awips2-python-cython
-#      scientific netcdf
-#         shapely geos
-#      matplotlib libpng
-#      matplotlib freetype
-#    notification libuuid-devel
-
-# All Requires
-#            cave openmotif
-#            cave libMrm.so.4()(64bit)
-#            cave libXp.so.6()(64bit)
-#            cave libg2c.so.0()(64bit)
-#     common-base netcdf
-#     common-base netcdf-devel
-#        database libpng
-#        database netcdf
-#        database netcdf-devel
-#        gfesuite numpy
-#    notification boost >= 1.33.1
-#           awips wget
-#           awips unzip
-#           awips bc
-#             ldm pax
-#             ldm gcc
-#             ldm libxml2-devel
-#             ldm boost-devel
-#             ldm libtool
-#             ldm libpng-devel
-#            h5py libz.so.1
-#    httpd-pypies initscripts >= 8.36, /etc/mime.types
-#    httpd-pypies pkgconfig, libtool
-#             jep atlas
-#      matplotlib libpng, freetype
-#           numpy compat-libf2c-34(x86-64) >= 3.4.6-19.el6
-#           numpy libgfortran(x86-64) >= 4.4.7-3.el6
-#      postgresql openssl >= 1.0.1e
-#      postgresql netcdf, geos
-#       qpid-java log4j >= 1.2.12
-#      scientific netcdf
-#        qpid-lib libstdc++
-

cave/build/p2-build.xml

@@ -220,9 +220,6 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.ncep.dataplugins.feature" />
 		</antcall>
-		<antcall target="p2.build.repo">
-			<param name="feature" value="com.raytheon.viz.hydro.feature" />
-		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature" value="com.raytheon.uf.viz.d2d.xy.feature" />
 		</antcall>