From 5f8148d663f1cd7e06d83628b09bdaba5f571696 Mon Sep 17 00:00:00 2001 From: Christopher hubing Date: Wed, 6 Dec 2017 23:21:51 +0000 Subject: [PATCH] Tomcat update and fixes --- api/Dockerfile | 2 +- java-base/Dockerfile | 2 +- ui/patch-scripts/grouper.installer-ui.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index c402391..3c500cd 100644 --- 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 diff --git a/java-base/Dockerfile b/java-base/Dockerfile index 7118771..71d9a73 100644 --- a/java-base/Dockerfile +++ b/java-base/Dockerfile @@ -2,7 +2,7 @@ FROM centos:centos7 MAINTAINER tier-packaging@internet2.edu -ENV JAVA_HOME=/opt/openjdk7 +ENV JAVA_HOME=/opt/openjdk8 RUN java_version=8.0.152; \ zulu_version=8.25.0.1; \ diff --git a/ui/patch-scripts/grouper.installer-ui.properties b/ui/patch-scripts/grouper.installer-ui.properties index a200f4c..385eaef 100644 --- 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