From bcb35c2b75fe35dc059920e7e709f550e9bb4e0c Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 23 Apr 2019 16:39:40 -0400
Subject: [PATCH] Update to tier shib-idp 3.4 immage wip

---
 base/Dockerfile                                             | 3 ++-
 base/container_files/tomcat/conf/Catalina/localhost/idp.xml | 2 +-
 base/manualBuild.sh                                         | 3 +++
 ex101/run.sh                                                | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100755 base/manualBuild.sh
 create mode 100755 ex101/run.sh

diff --git a/base/Dockerfile b/base/Dockerfile
index 8b0a043..fa22a9f 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,5 @@
-FROM unicon/shibboleth-idp:3.3.3 as idp 
+FROM tier/shib-idp:3.4.3_20190201 as idp
+#FROM tier/shib-idp:3.4.3_20190201 as idp
 
 # Grouper version for the entire GTE
 FROM tier/grouper:latest
diff --git a/base/container_files/tomcat/conf/Catalina/localhost/idp.xml b/base/container_files/tomcat/conf/Catalina/localhost/idp.xml
index 13bf32f..1f0367f 100644
--- a/base/container_files/tomcat/conf/Catalina/localhost/idp.xml
+++ b/base/container_files/tomcat/conf/Catalina/localhost/idp.xml
@@ -1,4 +1,4 @@
-<Context docBase="/opt/shibboleth-idp/webapp"
+<Context docBase="/opt/shibboleth-idp/war/idp.war"
          privileged="true"
          antiResourceLocking="false"
          path="/idp">
diff --git a/base/manualBuild.sh b/base/manualBuild.sh
new file mode 100755
index 0000000..8d03d30
--- /dev/null
+++ b/base/manualBuild.sh
@@ -0,0 +1,3 @@
+source ../buildVersion.sh
+echo "Building tier/gte version ${VERSION_TAG}"
+docker build --tag=tier/gte:base-${VERSION_TAG} .
\ No newline at end of file
diff --git a/ex101/run.sh b/ex101/run.sh
new file mode 100755
index 0000000..ef186c9
--- /dev/null
+++ b/ex101/run.sh
@@ -0,0 +1 @@
+docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-201906-shib-upgrade
\ No newline at end of file