xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devel/ade updates for 18.1.1-6

Browse source
This commit is contained in:
mjames-upc 2019-02-11 10:04:58 -07:00
parent f5df102e16
commit dccc45a15d
8 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/awips-ade/Dockerfile.awips-ade.el6
View file

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

2
build/awips-ade/Dockerfile.awips-ade.el7
View file

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

8
build/awips-ade/Dockerfile.awips-devel.el6
View file

@ -1,6 +1,6 @@
FROM centos:6 FROM centos:6
ENV VERSION 18.1.1 ENV VERSION 18.1.1
ENV RELEASE 1 ENV RELEASE 6
MAINTAINER Michael James <mjames@ucar.edu> MAINTAINER Michael James <mjames@ucar.edu>
USER root USER root
@ -10,11 +10,11 @@ RUN yum groupinstall "Development tools" -y
RUN yum install epel-release -y RUN yum install epel-release -y
RUN yum clean all -y RUN yum clean all -y
ENV systemDeps="wget rsync git net-tools" ENV systemDeps="wget rsync git net-tools gzip libtool"
ENV rpmDeps="gcc gcc-c++ rpm-build readline-devel createrepo" ENV rpmDeps="gcc gcc-c++ glibc-devel rpm-build readline-devel createrepo"
ENV qpidDeps="boost-devel cmake make ruby libuuid-devel" 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 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" 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 yum install $systemDeps $rpmDeps $qpidDeps $pythonDeps $awipsDeps $httpDeps -y

8
build/awips-ade/Dockerfile.awips-devel.el7
View file

@ -1,6 +1,6 @@
FROM centos:7 FROM centos:7
ENV VERSION 18.1.1 ENV VERSION 18.1.1
ENV RELEASE 1 ENV RELEASE 6
MAINTAINER Michael James <mjames@ucar.edu> MAINTAINER Michael James <mjames@ucar.edu>
USER root USER root
@ -11,11 +11,11 @@ RUN yum groupinstall "Development tools" -y
RUN yum install epel-release -y RUN yum install epel-release -y
RUN yum clean all -y RUN yum clean all -y
ENV systemDeps="wget rsync git net-tools" ENV systemDeps="wget rsync git net-tools gzip libtool"
ENV rpmDeps="gcc gcc-c++ rpm-build readline-devel createrepo" ENV rpmDeps="gcc gcc-c++ glibc-devel rpm-build readline-devel createrepo"
ENV qpidDeps="boost-devel cmake make ruby libuuid-devel" 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 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" 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 yum install $systemDeps $rpmDeps $qpidDeps $pythonDeps $awipsDeps $httpDeps -y

2
build/awips-ade/awips-devel.sh
View file

@ -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 ) dockerID=$(sudo docker images | grep ${img} | grep latest | awk '{print $3}' | head -1 )
sudo docker tag $dockerID unidata/${img}:${os_version} sudo docker tag $dockerID unidata/${img}:${os_version}
sudo docker rmi unidata/${img}:latest sudo docker rmi unidata/${img}:latest
#sudo docker push unidata/${img} sudo docker push unidata/${img}

2
build/awips-ade/el6-dev.repo
View file

@ -1,6 +1,6 @@
[awips2repo] [awips2repo]
name=AWIPS II Repository 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 enabled=1
protect=0 protect=0
gpgcheck=0 gpgcheck=0

2
build/buildEnvironment.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Version # Version
export AWIPSII_VERSION="18.1.1" export AWIPSII_VERSION="18.1.1"
export AWIPSII_RELEASE="5" export AWIPSII_RELEASE="6"
# Author # Author
export AWIPSII_BUILD_VENDOR="UCAR" export AWIPSII_BUILD_VENDOR="UCAR"
export AWIPSII_BUILD_SITE="Unidata" export AWIPSII_BUILD_SITE="Unidata"

2
dist/comps.xml vendored
View file

@ -11,7 +11,6 @@
<packagereq type="default">awips2-eclipse</packagereq> <packagereq type="default">awips2-eclipse</packagereq>
<packagereq type="default">awips2-ant</packagereq> <packagereq type="default">awips2-ant</packagereq>
<packagereq type="default">awips2-groovy</packagereq> <packagereq type="default">awips2-groovy</packagereq>
<packagereq type="default">awips2-ldm</packagereq>
<packagereq type="default">awips2-python</packagereq> <packagereq type="default">awips2-python</packagereq>
<packagereq type="default">awips2-python-cython</packagereq> <packagereq type="default">awips2-python-cython</packagereq>
<packagereq type="default">awips2-python-dateutil</packagereq> <packagereq type="default">awips2-python-dateutil</packagereq>
@ -45,7 +44,6 @@
<packagereq type="default">awips2-qpid-java-broker</packagereq> <packagereq type="default">awips2-qpid-java-broker</packagereq>
<packagereq type="default">awips2-qpid-lib</packagereq> <packagereq type="default">awips2-qpid-lib</packagereq>
<packagereq type="default">awips2-localization</packagereq> <packagereq type="default">awips2-localization</packagereq>
<packagereq type="default">awips2-ldm</packagereq>
<packagereq type="default">awips2-tools</packagereq> <packagereq type="default">awips2-tools</packagereq>
<packagereq type="default">awips2-maps-database</packagereq> <packagereq type="default">awips2-maps-database</packagereq>
<packagereq type="default">awips2-data.hdf5-topo</packagereq> <packagereq type="default">awips2-data.hdf5-topo</packagereq>