Updated Author/Maintainer on build scripts and removed el6 docker files

awips_install.sh

@@ -1,7 +1,8 @@
 #!/bin/bash -f
 # about:  AWIPS install manager
 # devorg: Unidata Program Center
-# author: <mjames@ucar.edu>
+# author: Michael James
+# maintainer: <tiffanym@ucar.edu>
 # use: ./awips_install.sh (--cave|--edex|--database|--ingest|--help)
 
 dir="$( cd "$(dirname "$0")" ; pwd -P )"

build/awips-ade-server/Dockerfile

@@ -0,0 +1,16 @@
+FROM centos:6
+ENV VERSION 18.1.1
+ENV RELEASE 1
+MAINTAINER Tiffany Meyer <tiffanym@ucar.edu>
+USER root
+
+RUN yum update yum -y
+RUN groupadd fxalpha && useradd -G fxalpha awips
+RUN yum install epel-release wget -y
+RUN yum clean all -y
+RUN wget -O /etc/yum.repos.d/awips2.repo https://www.unidata.ucar.edu/software/awips2/doc/el6-dev.repo
+COPY iptables /etc/sysconfig/iptables
+COPY install-ade-server.sh /root/
+RUN /root/install-ade-server.sh
+
+ENTRYPOINT ["/bin/bash"]

build/awips-ade-server/docker_build.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -v
+dir="$( cd "$(dirname "$0")" ; pwd -P )"
+pushd $dir
+. ../buildEnvironment.sh
+existing=$(sudo docker images |grep awips-ade-server | grep $1 | awk '{ print $3 }')
+if [ ! -z "$existing" ]; then
+   sudo docker rmi $existing
+fi
+pushd /awips2/repo/awips2-builds/build/awips-ade-server
+sudo docker build -t unidata/awips-ade-server -f Dockerfile .
+sudo docker push unidata/awips-ade-server

build/awips-ade-server/install-ade-server.sh

@@ -0,0 +1,14 @@
+#!/bin/bash 
+if [[ ! $(grep awips /etc/security/limits.conf) ]]; then
+  echo "Checking /etc/security/limits.conf for awips: Not found. Adding..."
+  printf "awips soft nproc 65536\nawips soft nofile 65536\n" >> /etc/security/limits.conf
+fi
+for dir in /awips2/tmp /awips2/data_store ; do
+  if [ ! -d $dir ]; then
+    echo "creating $dir"
+    mkdir -p $dir
+    chown awips:fxalpha $dir
+  fi
+done
+yum groupinstall awips2-ade-server -y
+/usr/bin/edex setup

build/awips-ade-server/iptables

@@ -0,0 +1,19 @@
+*filter
+:INPUT DROP [0:0]
+:FORWARD DROP [0:0]
+:OUTPUT ACCEPT [0:0]
+:EXTERNAL - [0:0]
+:EDEX - [0:0]
+-A INPUT -i lo -j ACCEPT
+-A INPUT -p icmp --icmp-type any -j ACCEPT
+-A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT
+-A INPUT -m state --state NEW -m tcp -p tcp --dport 22 -j ACCEPT
+-A INPUT -m state --state NEW -m tcp -p tcp --dport 9581 -j ACCEPT
+-A INPUT -m state --state NEW -m tcp -p tcp --dport 9582 -j ACCEPT
+-A INPUT -s 10.0.0.7 -j EDEX
+-A INPUT -j EXTERNAL
+-A EXTERNAL -j REJECT
+-A EDEX -m state --state NEW -p tcp --dport 5432 -j ACCEPT
+-A EDEX -m state --state NEW -p tcp --dport 5672 -j ACCEPT
+-A EDEX -j REJECT
+COMMIT

build/awips-ade/Dockerfile.awips-ade.el6

@@ -1,19 +0,0 @@
-FROM unidata/awips-devel:el6
-ENV VERSION 18.1.1
-ENV RELEASE 6
-MAINTAINER Michael James <mjames@ucar.edu>
-
-USER root
-
-COPY el6-dev.repo /etc/yum.repos.d/awips2.repo
-
-RUN groupadd fxalpha && useradd -G fxalpha awips
-
-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_latest/{x86_64,noarch}/
-RUN chown -R awips:fxalpha /awips2/jenkins/
-
-ENTRYPOINT ["/bin/bash"]

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

@@ -1,7 +1,7 @@
 FROM unidata/awips-devel:el7
 ENV VERSION 18.1.1
 ENV RELEASE 6
-MAINTAINER Michael James <mjames@ucar.edu>
+MAINTAINER Tiffany Meyer<tiffanym@ucar.edu>
 
 USER root
 

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

@@ -1,22 +0,0 @@
-FROM centos:6
-ENV VERSION 18.1.1
-ENV RELEASE 6
-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 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 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
-
-ENTRYPOINT ["/bin/bash"]

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

@@ -1,7 +1,7 @@
 FROM centos:7
 ENV VERSION 18.1.1
 ENV RELEASE 6
-MAINTAINER Michael James <mjames@ucar.edu>
+MAINTAINER Tiffany Meyer<tiffanym@ucar.edu>
 
 USER root
 

build/awips-ade/awips-ade.sh

@@ -5,7 +5,7 @@ pushd $dir
 
 
 if [ -z "$1" ]; then
-  echo "supply type (el6, el7)"
+  echo "supply type (el7)"
   exit
 fi
 os_version=$1

build/awips-ade/awips-devel.sh

@@ -6,7 +6,7 @@ img="awips-devel"
 
 
 if [ -z "$1" ]; then
-  echo "supply type (el6, el7)"
+  echo "supply type (el7)"
   exit
 fi
 os_version=$1

build/awips-ade/el6-dev.repo

@@ -1,7 +0,0 @@
-[awips2repo]
-name=AWIPS II Repository
-baseurl=https://www.unidata.ucar.edu/repos/yum/el6-dev/
-enabled=1
-protect=0
-gpgcheck=0
-proxy=_none_

build/buildEnvironment.sh

@@ -5,7 +5,7 @@ export AWIPSII_RELEASE="1"
 # Author
 export AWIPSII_BUILD_VENDOR="UCAR"
 export AWIPSII_BUILD_SITE="Unidata"
-export AWIPSII_AUTHOR="Michael James <mjames@ucar.edu>"
+export AWIPSII_AUTHOR="Tiffany Meyer <tiffanym@ucar.edu>"
 # Directories
 export UFRAME_ECLIPSE=/awips2/eclipse
 export JAVA_HOME=/awips2/java

build/build_rpms.sh

@@ -1,7 +1,8 @@
 #!/bin/sh -xe
 #
 # Build Unidata AWIPS RPMs from source
-# Author: mjames@ucar.edu
+# author: Michael James
+# maintainer: <tiffanym@ucar.edu>
 #
 
 #
@@ -12,7 +13,7 @@ os_version=$1
 rpmname=$2
 
 if [ -z "$os_version" ]; then
-  echo "supply os_version (el6, el7)"
+  echo "supply os_version (el7)"
   exit
 fi
 

build/setup.sh

@@ -1,14 +1,15 @@
 #!/bin/sh -xe
 #
 # Unidata AWIPS Build Setup Script
-# Author: mjames@ucar.edu
+# author: Michael James
+# maintainer: <tiffanym@ucar.edu>
 #
 
 #
 # Require el6 or el7 be specified
 #
 if [ -z "$1" ]; then
-  echo "supply type (el6, el7)"
+  echo "supply type (el7)"
   exit
 fi
 os_version=$1