From c0d75f4070c443b19199864e67f27010e872da76 Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Thu, 5 Jul 2018 11:53:39 -0600 Subject: [PATCH] update to build 18.1.1-1 --- .travis.yml | 2 +- README.md | 6 +++--- build/awips-ade/Dockerfile.awips-ade.el6 | 25 +++++----------------- build/awips-ade/Dockerfile.awips-ade.el7 | 8 +++---- build/awips-ade/Dockerfile.awips-devel.el6 | 22 +++++++++++++++++++ build/awips-ade/devel_build.sh | 23 ++++++++++++++++++++ build/awips-ade/docker_build.sh | 7 +++++- build/build.sh | 4 ++-- build/build_rpms.sh | 8 +++---- build/cibuild.sh | 4 ++-- build/edex-ingest/Dockerfile.edex | 4 ++-- build/edex-ingest/docker_build.sh | 6 +++++- build/setup.sh | 3 ++- 13 files changed, 81 insertions(+), 41 deletions(-) create mode 100644 build/awips-ade/Dockerfile.awips-devel.el6 create mode 100755 build/awips-ade/devel_build.sh diff --git a/.travis.yml b/.travis.yml index d9d9bc480a..f084a25e5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: required branches: - - unidata_17.1.1 + - unidata_18.1.1 language: ruby diff --git a/README.md b/README.md index f8a8017afa..b015070ae2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [https://www.unidata.ucar.edu/software/awips/](https://www.unidata.ucar.edu/software/awips/) -[![GitHub release](https://img.shields.io/github/release/Unidata/awips2/all.svg)]() [![Travis Badge](https://travis-ci.org/Unidata/awips2.svg?branch=unidata_17.1.1)](https://travis-ci.org/Unidata/awips2) +[![GitHub release](https://img.shields.io/github/release/Unidata/awips2/all.svg)]() [![Travis Badge](https://travis-ci.org/Unidata/awips2.svg?branch=unidata_18.1.1)](https://travis-ci.org/Unidata/awips2) AWIPS (formerly know as AWIPS II or AWIPS2) is a meteorological display and analysis package developed by the [National Weather Service](http://www.nws.noaa.gov/ost/SEC/AE/) and [Raytheon](http://www.raytheon.com/capabilities/products/awips/) for operational forecasting. AWIPS is a Java application consisting of a data-rendering client ([CAVE](http://unidata.github.io/awips2/install/install-cave/), which runs on Red Hat/CentOS Linux, macOS, and Windows), and a backend data server ([EDEX](http://unidata.github.io/awips2/install/install-edex), which runs on x86_64 Red Hat/CentOS 6 and 7). @@ -63,11 +63,11 @@ Instructions on how to deploy CAVE from Eclipse. 2. `yum clean all && yum groupinstall awips2-ade` - This will install Eclipse (4.5), Java (1.8), Ant, Maven, Python 2.7 and its modules (Numpy, Shapely, etc.) + This will install Eclipse (4.6.1), Java (1.8), Ant, Maven, Python 2.7 and its modules (Numpy, Shapely, etc.) 3. `git clone https://github.com/Unidata/awips2.git` - The full list of repositories required as of release 17.1.1: + The full list of repositories required: git clone https://github.com/Unidata/awips2.git git clone https://github.com/Unidata/awips2-core.git diff --git a/build/awips-ade/Dockerfile.awips-ade.el6 b/build/awips-ade/Dockerfile.awips-ade.el6 index 100cb12f30..dbca758e1a 100644 --- a/build/awips-ade/Dockerfile.awips-ade.el6 +++ b/build/awips-ade/Dockerfile.awips-ade.el6 @@ -1,33 +1,18 @@ -FROM centos:6 -ENV VERSION 17.1.1 -ENV RELEASE 4 +FROM unidata/awips-devel:el6 +ENV VERSION 18.1.1 +ENV RELEASE 1 MAINTAINER Michael James 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/el6-dev.repo +RUN wget -O /etc/yum.repos.d/awips2.repo https://www.unidata.ucar.edu/software/awips2/doc/el6-dev.repo?20180627 RUN yum -y clean all RUN yum groupinstall awips2-ade -y RUN mkdir -p /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline && mkdir -p /awips2/jenkins/buildspace/workspace/tmp -RUN mkdir -p /awips2/jenkins/build/rpms/awips2_${VERSION}/{x86_64,noarch}/ +RUN mkdir -p /awips2/jenkins/build/rpms/awips2_latest/{x86_64,noarch}/ RUN chown -R awips:fxalpha /awips2/jenkins/ ENTRYPOINT ["/bin/bash"] diff --git a/build/awips-ade/Dockerfile.awips-ade.el7 b/build/awips-ade/Dockerfile.awips-ade.el7 index 7b99b676d1..0c1d5814f9 100644 --- a/build/awips-ade/Dockerfile.awips-ade.el7 +++ b/build/awips-ade/Dockerfile.awips-ade.el7 @@ -1,6 +1,6 @@ -FROM centos:7 -ENV VERSION 17.1.1 -ENV RELEASE 6 +FROM awips-devel:el7 +ENV VERSION 18.1.1 +ENV RELEASE 1 MAINTAINER Michael James USER root @@ -27,7 +27,7 @@ RUN yum -y clean all RUN yum groupinstall awips2-ade -y RUN mkdir -p /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline && mkdir -p /awips2/jenkins/buildspace/workspace/tmp -RUN mkdir -p /awips2/jenkins/build/rpms/awips2_${VERSION}/{x86_64,noarch}/ +RUN mkdir -p /awips2/jenkins/build/rpms/awips2_latest/{x86_64,noarch}/ RUN chown -R awips:fxalpha /awips2/jenkins/ ENTRYPOINT ["/bin/bash"] diff --git a/build/awips-ade/Dockerfile.awips-devel.el6 b/build/awips-ade/Dockerfile.awips-devel.el6 new file mode 100644 index 0000000000..6202e2baa8 --- /dev/null +++ b/build/awips-ade/Dockerfile.awips-devel.el6 @@ -0,0 +1,22 @@ +FROM centos:6 +ENV VERSION 18.1.1 +ENV RELEASE 1 +MAINTAINER Michael James + +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"] diff --git a/build/awips-ade/devel_build.sh b/build/awips-ade/devel_build.sh new file mode 100755 index 0000000000..f93fbbaccf --- /dev/null +++ b/build/awips-ade/devel_build.sh @@ -0,0 +1,23 @@ +#!/bin/bash +dir="$( cd "$(dirname "$0")" ; pwd -P )" +pushd $dir +. ../buildEnvironment.sh +img="awips-devel" + + +if [ -z "$1" ]; then + echo "supply type (el6, el7)" + exit +fi +os_version=$1 + +existing=$(sudo docker images |grep ${img} | 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/${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} diff --git a/build/awips-ade/docker_build.sh b/build/awips-ade/docker_build.sh index d9fdcc8103..7df65cc6fd 100755 --- a/build/awips-ade/docker_build.sh +++ b/build/awips-ade/docker_build.sh @@ -1,4 +1,9 @@ #!/bin/bash +dir="$( cd "$(dirname "$0")" ; pwd -P )" +pushd $dir +. ../buildEnvironment.sh + + if [ -z "$1" ]; then echo "supply type (el6, el7)" exit @@ -12,6 +17,6 @@ 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 images | grep awips-ade | grep latest | awk '{print $3}' | head -1 ) -sudo docker tag $dockerID unidata/awips-ade:17.1.1-${os_version} +sudo docker tag $dockerID unidata/awips-ade:${AWIPSII_VERSION}-${os_version} sudo docker rmi unidata/awips-ade:latest sudo docker push unidata/awips-ade diff --git a/build/build.sh b/build/build.sh index f3d052954b..64b4050708 100755 --- a/build/build.sh +++ b/build/build.sh @@ -70,10 +70,10 @@ popd > /dev/null 2>&1 export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}" if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then - mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/ + mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* ${JENKINS_HOME}/build/rpms/awips2_latest/x86_64/ fi if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then - mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/noarch/ + mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* ${JENKINS_HOME}/build/rpms/awips2_latest/noarch/ fi END_TIME=`date "+%s"` diff --git a/build/build_rpms.sh b/build/build_rpms.sh index 4fe8ae9cbd..e835b51e8b 100755 --- a/build/build_rpms.sh +++ b/build/build_rpms.sh @@ -74,10 +74,10 @@ else fi # Move RPMs to awips2-builds/dist -if [ "$(ls -A ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/)" ]; then - mv ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/* /awips2/repo/awips2-builds/dist/${os_version}-dev/x86_64/ +if [ "$(ls -A ${JENKINS_HOME}/build/rpms/awips2_latest/x86_64/)" ]; then + mv ${JENKINS_HOME}/build/rpms/awips2_latest/x86_64/* /awips2/repo/awips2-builds/dist/${os_version}-dev/x86_64/ fi -if [ "$(ls -A ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/noarch/)" ]; then - mv ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/noarch/* /awips2/repo/awips2-builds/dist/${os_version}-dev/noarch/ +if [ "$(ls -A ${JENKINS_HOME}/build/rpms/awips2_latest/noarch/)" ]; then + mv ${JENKINS_HOME}/build/rpms/awips2_latest/noarch/* /awips2/repo/awips2-builds/dist/${os_version}-dev/noarch/ fi diff --git a/build/cibuild.sh b/build/cibuild.sh index c3856bbf5e..5b18d918ed 100755 --- a/build/cibuild.sh +++ b/build/cibuild.sh @@ -58,10 +58,10 @@ popd > /dev/null 2>&1 export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}" if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then - mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/ + mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* ${JENKINS_HOME}/build/rpms/awips2_latest/x86_64/ fi if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then - mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* ${JENKINS_HOME}/build/rpms/awips2_${AWIPSII_VERSION}/noarch/ + mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* ${JENKINS_HOME}/build/rpms/awips2_latest/noarch/ fi END_TIME=`date "+%s"` diff --git a/build/edex-ingest/Dockerfile.edex b/build/edex-ingest/Dockerfile.edex index b334f2d815..4b5881508d 100644 --- a/build/edex-ingest/Dockerfile.edex +++ b/build/edex-ingest/Dockerfile.edex @@ -1,6 +1,6 @@ FROM centos:7 -ENV VERSION 17.1.1 -ENV RELEASE 6 +ENV VERSION 18.1.1 +ENV RELEASE 1 MAINTAINER Michael James USER root diff --git a/build/edex-ingest/docker_build.sh b/build/edex-ingest/docker_build.sh index aee276dcff..200398171c 100755 --- a/build/edex-ingest/docker_build.sh +++ b/build/edex-ingest/docker_build.sh @@ -1,4 +1,8 @@ #!/bin/bash -v +dir="$( cd "$(dirname "$0")" ; pwd -P )" +pushd $dir +. ../buildEnvironment.sh + existing=$(sudo docker images |grep edex-ingest | grep $1 | awk '{ print $3 }') if [ ! -z "$existing" ]; then sudo docker rmi $existing @@ -6,6 +10,6 @@ fi pushd /awips2/repo/awips2-builds/build/edex-ingest sudo docker build -t unidata/edex-ingest -f Dockerfile.edex . dockerID=$(sudo docker images | grep edex-ingest | grep latest | awk '{print $3}' | head -1 ) -sudo docker tag $dockerID unidata/edex-ingest:17.1.1 +sudo docker tag $dockerID unidata/edex-ingest:${AWIPSII_VERSION} sudo docker rmi unidata/edex-ingest:latest sudo docker push unidata/edex-ingest diff --git a/build/setup.sh b/build/setup.sh index bb6ea59c17..76dc12b9e3 100755 --- a/build/setup.sh +++ b/build/setup.sh @@ -14,6 +14,7 @@ fi os_version=$1 rpmname=$2 builds_dir=" -v `pwd`:/awips2/repo/awips2-builds:rw " +. /awips2/repo/awips2-builds/build/buildEnvironment.sh # # If local source directories, exist, mount them to the container @@ -34,7 +35,7 @@ dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_ # Run Docker AWIPS ADE Image # imgname=unidata/awips-ade -imgvers=17.1.1 +imgvers=${AWIPSII_VERSION} sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" $dirs $imgname:$imgvers-$os_version dockerID=$(sudo docker ps | grep awips-ade | awk '{print $1}' | head -1 ) sudo docker logs $dockerID