From 69d2407ba3ecf9c5c2deec5bef3455551a006240 Mon Sep 17 00:00:00 2001
From: Christopher hubing <chubing@internet2.edu>
Date: Wed, 11 Oct 2017 18:29:26 +0000
Subject: [PATCH] Updated Tomcat and fixed sha1 for Apache Ant.

---
 test-compose/docker-compose.yml                      |  4 ++--
 test-compose/www/Dockerfile                          |  2 +-
 .../www/container_files/shibboleth/shibboleth2.xml   |  4 ++--
 ui/Dockerfile                                        |  2 +-
 ui/patch-scripts/grouper.installer-ui.properties     |  2 +-
 web-base/Dockerfile                                  | 12 ++++++------
 ws/Dockerfile                                        |  2 +-
 ws/patch-scripts/grouper.installer-ws.properties     |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index a9a360f..3479c4e 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.20/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.23/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.20/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.23/bin/catalina.sh run"
     depends_on: 
      - data
     networks:
diff --git a/test-compose/www/Dockerfile b/test-compose/www/Dockerfile
index 42bb842..509fe02 100644
--- a/test-compose/www/Dockerfile
+++ b/test-compose/www/Dockerfile
@@ -28,7 +28,7 @@ COPY container_files/shibboleth/attribute-map.xml /etc/shibboleth
 COPY container_files/bin/httpd-shib-foreground /opt/bin/
 
 # Uncomment the following line to turn on shib SP debugging
-#COPY container_files/shibboleth/shibd.logger /etc/shibboleth/shibd.logger
+COPY container_files/shibboleth/shibd.logger /etc/shibboleth/shibd.logger
 COPY container_files/httpd/grouper-www.conf /etc/httpd/conf.d/
 COPY container_files/httpd/logout.php /var/www/cgi-bin/logout.php
 COPY container_files/bin/startup.sh /usr/bin/startup.sh
diff --git a/test-compose/www/container_files/shibboleth/shibboleth2.xml b/test-compose/www/container_files/shibboleth/shibboleth2.xml
index e00fc54..a6625be 100644
--- a/test-compose/www/container_files/shibboleth/shibboleth2.xml
+++ b/test-compose/www/container_files/shibboleth/shibboleth2.xml
@@ -22,7 +22,7 @@
 
 
     <!-- The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined. -->
-    <ApplicationDefaults entityID="https://sp.example.org/shibboleth"
+    <ApplicationDefaults entityID="https://jagger.testbed.tier.internet2.edu/shibboleth"
                          REMOTE_USER="eppn persistent-id targeted-id">
 
         <!--
@@ -35,7 +35,7 @@
         security of your site. Stealing sessions via cookie theft is much easier with this disabled.
         -->
         <Sessions lifetime="28800" timeout="28800" relayState="ss:mem"
-                  checkAddress="false" handlerSSL="false" cookieProps="https">
+                  checkAddress="false" handlerSSL="true" cookieProps="https">
 
             <!--
             Configures SSO for a default IdP. To allow for >1 IdP, remove
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 82b888f..7c6acf0 100644
--- 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.20"
+ENV TOMCAT_VERSION="8.5.23"
 
 ##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
index 2d8e8e6..a200f4c 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.20/webapps/grouper/
+grouperInstaller.autorun.grouperWhereInstalled = /opt/apache-tomcat-8.5.23/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
index db4f12f..5d6a319 100644
--- 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.20"
+ENV TOMCAT_VERSION="8.5.23"
 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,12 +17,12 @@ RUN yum update -y \
     \
     && echo 'Downloading Tomcat...' \
     && wget -q -O tomcat.tar.gz "$TOMCAT_TGZ_URL" \
-    && echo "e0c8b5f2c5ac4bea302d50101cac46b57947a920 tomcat.tar.gz" | sha1sum -c - \
+    && echo "1ba27c1bb86ab9c8404e98068800f90bd662523c 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 {} \; \
-    \
-    && echo 'Downloading Ant...'\
+    && find /opt/apache-tomcat-$TOMCAT_VERSION/bin/ -name "*.sh" -exec chmod a+x {} \; 
+
+RUN  echo 'Downloading Ant...'\
     && wget -q -O ant.zip https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.zip \
     && unzip ant.zip -d /opt \
     && echo "fa9acb3b1987f8acf2aa7a87894d1fd9da80e871 ant.zip" | sha1sum -c - \
@@ -31,4 +31,4 @@ RUN yum update -y \
 
 EXPOSE 8080
 
-CMD ["/opt/apache-tomcat-8.5.20/bin/catalina.sh", "run"]
+CMD ["/opt/apache-tomcat-8.5.23/bin/catalina.sh", "run"]
diff --git a/ws/Dockerfile b/ws/Dockerfile
index e36cc8b..3fcc0d4 100644
--- 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.20"
+ENV TOMCAT_VERSION="8.5.23"
 
 ##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 ceb3d1b..e8e7cc4 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.20/webapps/grouper-ws/
+grouperInstaller.autorun.grouperWhereInstalled = /opt/apache-tomcat-8.5.23/webapps/grouper-ws/
 grouperInstaller.autorun.patchAction = install
 grouper.version = 2.3.0
 download.server.url = http://software.internet2.edu/grouper