From 7f82ec914be6dd0b2bfb8ba1c86b808b26ac2307 Mon Sep 17 00:00:00 2001 From: Christopher hubing Date: Wed, 6 Dec 2017 22:58:35 +0000 Subject: [PATCH 1/3] updated Java 8u152 and Tomcat 8.5.24 --- java-base/Dockerfile | 6 +++--- manualBuild.sh | 2 +- ui/Dockerfile | 4 ++-- web-base/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-base/Dockerfile b/java-base/Dockerfile index 6f1e018..7118771 100644 --- a/java-base/Dockerfile +++ b/java-base/Dockerfile @@ -4,15 +4,15 @@ MAINTAINER 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 diff --git a/manualBuild.sh b/manualBuild.sh index 120ab41..1e15d80 100755 --- 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/ui/Dockerfile b/ui/Dockerfile index 7c6acf0..f1076bc 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -3,8 +3,8 @@ FROM tier/grouper-web-base:2.3.0 MAINTAINER 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" diff --git a/web-base/Dockerfile b/web-base/Dockerfile index 5d6a319..611cfa9 100644 --- a/web-base/Dockerfile +++ b/web-base/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" 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 {} \; From 5f8148d663f1cd7e06d83628b09bdaba5f571696 Mon Sep 17 00:00:00 2001 From: Christopher hubing Date: Wed, 6 Dec 2017 23:21:51 +0000 Subject: [PATCH 2/3] 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 From a65179396b2fc07ae9aa3da27ebb109624b4db21 Mon Sep 17 00:00:00 2001 From: Christopher hubing Date: Wed, 6 Dec 2017 23:40:46 +0000 Subject: [PATCH 3/3] 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