updated Java 8u152 and Tomcat 8.5.24

java-base/Dockerfile

@@ -4,15 +4,15 @@ MAINTAINER tier-packaging@internet2.edu <tier-packaging@internet2.edu>
 
 ENV JAVA_HOME=/opt/openjdk7
 
-RUN java_version=8.0.131; \ 
-    zulu_version=8.21.0.1; \   
+RUN java_version=8.0.152; \ 
+    zulu_version=8.25.0.1; \   
     yum update -y \
     && yum install -y wget tar \
     && yum clean all \
     \
     && echo 'Downloading the OpenJDK Zulu...' \ 
     && wget -q http://cdn.azul.com/zulu/bin/zulu$zulu_version-jdk$java_version-linux_x64.tar.gz \
-    && echo "1931ed3beedee0b16fb7fd37e069b162  zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
+    && echo "cc6e9ff13c27d27033220208d5450f2d  zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
     && tar -zxvf zulu$zulu_version-jdk$java_version-linux_x64.tar.gz -C /opt \
     && ln -s /opt/zulu$zulu_version-jdk$java_version-linux_x64 $JAVA_HOME \
     && rm zulu$zulu_version-jdk$java_version-linux_x64.tar.gz

manualBuild.sh

@@ -1,5 +1,5 @@
 docker pull centos:centos7 \
-&& docker build --tag=tier/grouper-java-base:7u95 java-base \
+&& docker build --tag=tier/grouper-java-base:8u152 java-base \
 && docker build --tag=tier/grouper-api:2.3.0 api \
 && docker build --tag=tier/grouper-daemon:2.3.0 daemon \
 && docker build --tag=tier/grouper-web-base:2.3.0 web-base \

ui/Dockerfile

@@ -3,8 +3,8 @@ FROM tier/grouper-web-base:2.3.0
 MAINTAINER tier-packaging@internet2.edu <tier-packaging@internet2.edu>
 
 ##tomcat
-ENV TOMCAT_MAJOR=8
-ENV TOMCAT_VERSION="8.5.23"
+##ENV TOMCAT_MAJOR=8
+##ENV TOMCAT_VERSION="8.5.23"
 
 ##ant
 ENV ANT_VERSION="1.10.1"

web-base/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER tier-packaging@internet2.edu <tier-packaging@internet2.edu>
 
 ##tomcat
 ENV TOMCAT_MAJOR=8
-ENV TOMCAT_VERSION="8.5.23"
+ENV TOMCAT_VERSION="8.5.24"
 ENV TOMCAT_TGZ_URL=https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
 
 ##ant
@@ -17,7 +17,7 @@ RUN yum update -y \
     \
     && echo 'Downloading Tomcat...' \
     && wget -q -O tomcat.tar.gz "$TOMCAT_TGZ_URL" \
-    && echo "1ba27c1bb86ab9c8404e98068800f90bd662523c tomcat.tar.gz" | sha1sum -c - \
+    && echo "9e26ba61c5665aafc849073edeb769be555283cd tomcat.tar.gz" | sha1sum -c - \
     && tar -zxf tomcat.tar.gz -C /opt \    
     && rm tomcat.tar.gz \
     && find /opt/apache-tomcat-$TOMCAT_VERSION/bin/ -name "*.sh" -exec chmod a+x {} \;