updating to Tomcat 8.5.24

docker · Dec 6, 2017 · a651793 · a651793
1 parent 5f8148d
commit a651793
Showing 6 changed files with 7 additions and 7 deletions.
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
@@ -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/web-base/Dockerfile b/web-base/Dockerfile
@@ -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