Merge pull request #7 from docker/tomcat-8.5.24

Updated to Tomcat 8.5.24 and zulu 8.25.0.1
docker · Dec 7, 2017 · eb05898 · eb05898
2 parents 5368aeb + a651793
commit eb05898
Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/grouper-java-base:7u95
+FROM tier/grouper-java-base:8u152
 
 MAINTAINER tier-packaging@internet2.edu <tier-packaging@internet2.edu>
 

diff --git a/java-base/Dockerfile b/java-base/Dockerfile
@@ -2,17 +2,17 @@ FROM centos:centos7
 
 MAINTAINER tier-packaging@internet2.edu <tier-packaging@internet2.edu>
 
-ENV JAVA_HOME=/opt/openjdk7
+ENV JAVA_HOME=/opt/openjdk8
 
-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
diff --git a/manualBuild.sh b/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 \

diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
@@ -12,7 +12,7 @@ services:
 
   ui:
     build: ./ui/
-    command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /opt/apache-tomcat-8.5.23/bin/catalina.sh run"
+    command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /opt/apache-tomcat-8.5.24/bin/catalina.sh run"
     depends_on: 
      - data
     networks:
@@ -23,7 +23,7 @@ services:
 
   ws:
     build: ./ws/
-    command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /opt/apache-tomcat-8.5.23/bin/catalina.sh run"
+    command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; /opt/apache-tomcat-8.5.24/bin/catalina.sh run"
     depends_on: 
      - data
     networks:

diff --git a/test-compose/ui/Dockerfile b/test-compose/ui/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"
 
 COPY WEB-INF/classes/ /opt/apache-tomcat-$TOMCAT_VERSION/webapps/grouper/WEB-INF/classes
 COPY WEB-INF/web.xml /opt/apache-tomcat-$TOMCAT_VERSION/webapps/grouper/WEB-INF/

diff --git a/ui/Dockerfile b/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.24"
 
 ##ant
 ENV ANT_VERSION="1.10.1"

diff --git a/ui/patch-scripts/grouper.installer-ui.properties b/ui/patch-scripts/grouper.installer-ui.properties
@@ -3,7 +3,7 @@ grouperInstaller.autorun.continueAfterDeleteUiWorkDirectory = true
 grouperInstaller.autorun.actionEgInstallUpgradePatch = patch
 grouperInstaller.autorun.tarballDirectory = /tmp/grp-ui
 grouperInstaller.autorun.appToUpgrade = ui
-grouperInstaller.autorun.grouperWhereInstalled = /opt/apache-tomcat-8.5.23/webapps/grouper/
+grouperInstaller.autorun.grouperWhereInstalled = /opt/apache-tomcat-8.5.24/webapps/grouper/
 grouperInstaller.autorun.patchAction = install
 grouper.version = 2.3.0
 download.server.url = http://software.internet2.edu/grouper
diff --git a/web-base/Dockerfile b/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 {} \; 
@@ -31,4 +31,4 @@ RUN  echo 'Downloading Ant...'\
 
 EXPOSE 8080
 
-CMD ["/opt/apache-tomcat-8.5.23/bin/catalina.sh", "run"]
+CMD ["/opt/apache-tomcat-8.5.24/bin/catalina.sh", "run"]
diff --git a/ws/Dockerfile b/ws/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"
 
 ##ant
 ENV ANT_VERSION="1.10.1"

diff --git a/ws/patch-scripts/grouper.installer-ws.properties b/ws/patch-scripts/grouper.installer-ws.properties
@@ -2,7 +2,7 @@ grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true
 grouperInstaller.autorun.actionEgInstallUpgradePatch = patch
 grouperInstaller.autorun.tarballDirectory = /tmp/grp-ws
 grouperInstaller.autorun.appToUpgrade = ws
-grouperInstaller.autorun.grouperWhereInstalled = /opt/apache-tomcat-8.5.23/webapps/grouper-ws/
+grouperInstaller.autorun.grouperWhereInstalled = /opt/apache-tomcat-8.5.24/webapps/grouper-ws/
 grouperInstaller.autorun.patchAction = install
 grouper.version = 2.3.0
 download.server.url = http://software.internet2.edu/grouper