From fefda277b9d8018a44278d29968f17ccf3f3d9ef Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Wed, 3 Aug 2016 17:09:21 -0400
Subject: [PATCH 1/2] Putting in start stub for Shib IDP war deployment

---
 Dockerfile                | 5 ++++-
 files/idp.xml             | 4 ++++
 tests/shibboleth-idp.bats | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 files/idp.xml

diff --git a/Dockerfile b/Dockerfile
index c31282b..1a61305 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -93,7 +93,10 @@ RUN set -x \
 #	&& gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz \
 	&& tar -xvf tomcat.tar.gz --strip-components=1 \
 	&& rm bin/*.bat \
-	&& rm tomcat.tar.gz*
+	&& rm tomcat.tar.gz* \
+    && mkdir -p conf/Catalina
+    
+ADD files/idp.xml conf/Catalina/idp.xml
 
 
 ENV PATH $CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
diff --git a/files/idp.xml b/files/idp.xml
new file mode 100644
index 0000000..8b6d092
--- /dev/null
+++ b/files/idp.xml
@@ -0,0 +1,4 @@
+<Context docBase="/opt/shibboleth-idp/war/idp.war"
+         privileged="true"
+         antiResourceLocking="false"
+         swallowOutput="true" />
\ No newline at end of file
diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats
index cc62ddc..08d72d6 100644
--- a/tests/shibboleth-idp.bats
+++ b/tests/shibboleth-idp.bats
@@ -12,6 +12,11 @@ load ../common
   [ "$result" != '' ]
 }
 
+@test "Tomcat will start Shibboleth IDP when started" {
+  result="$(docker run -i $maintainer/$imagename find conf/Catalina/idp.xml)"
+  [ "$result" != '' ]
+}
+
 @test "Contains java" {
   run docker run -i $maintainer/$imagename which java
   [ "$status" -eq 0 ]

From 16b0e8c7cefd3402fd65c8aa19f8a97be02315c4 Mon Sep 17 00:00:00 2001
From: Jim Van Fleet <jim.van.fleet@levvel.io>
Date: Wed, 3 Aug 2016 17:24:38 -0400
Subject: [PATCH 2/2] Adapting path of WAR file to match what WAR we can build

---
 files/idp.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/idp.xml b/files/idp.xml
index 8b6d092..19c24db 100644
--- a/files/idp.xml
+++ b/files/idp.xml
@@ -1,4 +1,4 @@
-<Context docBase="/opt/shibboleth-idp/war/idp.war"
+<Context docBase="/opt/shibboleth/current/war/idp.war"
          privileged="true"
          antiResourceLocking="false"
          swallowOutput="true" />
\ No newline at end of file