From a65179396b2fc07ae9aa3da27ebb109624b4db21 Mon Sep 17 00:00:00 2001 From: Christopher hubing Date: Wed, 6 Dec 2017 23:40:46 +0000 Subject: [PATCH] updating to Tomcat 8.5.24 --- test-compose/docker-compose.yml | 4 ++-- test-compose/ui/Dockerfile | 2 +- ui/Dockerfile | 2 +- web-base/Dockerfile | 2 +- ws/Dockerfile | 2 +- ws/patch-scripts/grouper.installer-ws.properties | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index 3479c4e..5bb01f5 100644 --- 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 index 377e901..aa50fad 100644 --- a/test-compose/ui/Dockerfile +++ b/test-compose/ui/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER 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 index f1076bc..cca3053 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER 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 index 611cfa9..afebda9 100644 --- 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 index 3fcc0d4..1506708 100644 --- a/ws/Dockerfile +++ b/ws/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER 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 index e8e7cc4..e0a17da 100644 --- 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