From 4ad3b2c142ca279dfcee6e4739f8e9f33cc667ae Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 8 Jun 2017 11:17:51 -0500
Subject: [PATCH] more bugfixes

---
 Dockerfile       | 12 ++++++------
 configBuilder.sh | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c92ecc5..7c0adfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -212,12 +212,12 @@ ARG SHBLOG=logs/shib-idp
 ## ADD ${TOMCFG} /usr/local/tomcat/conf
 ## ADD ${TOMCERT} /opt/certs
 ## ADD ${TOMWWWROOT} /usr/local/tomcat/webapps/ROOT
-## ADD ${SHBCFG} /opt/shibboleth/shibboleth-identity-provider-$VERSION/conf
-## ADD ${SHBCREDS} /opt/shibboleth/shibboleth-identity-provider-$VERSION/credentials
-## ADD ${SHBVIEWS} /opt/shibboleth/shibboleth-identity-provider-$VERSION/views
-## ADD ${SHBEDWAPP} /opt/shibboleth/shibboleth-identity-provider-$VERSION/edit-webapp
-## ADD ${SHBMSGS} /opt/shibboleth/shibboleth-identity-provider-$VERSION/messages
-## ADD ${SHBMD} /opt/shibboleth/shibboleth-identity-provider-$VERSION/metadata
+## ADD ${SHBCFG} /opt/shibboleth-idp/conf
+## ADD ${SHBCREDS} /opt/shibboleth-idp/credentials
+## ADD ${SHBVIEWS} /opt/shibboleth-idp/views
+## ADD ${SHBEDWAPP} /opt/shibboleth-idp/edit-webapp
+## ADD ${SHBMSGS} /opt/shibboleth-idp/messages
+## ADD ${SHBMD} /opt/shibboleth-idp/metadata
 
 # Expose the port tomcat will be serving on
 EXPOSE 8443
diff --git a/configBuilder.sh b/configBuilder.sh
index 492f815..4465996 100755
--- a/configBuilder.sh
+++ b/configBuilder.sh
@@ -508,9 +508,12 @@ if [ ${BURNMOUNT} == "burn" ]; then
   echo " It will be necessary to specify where to find your config at build-time, "
   echo "      so that it can be copied into the container."
   echo ""
-  echo " If you are using the default config locations (used by the configBuilder.sh script), then the following command would be correct."
-  echo "       (substitute paths for your own environment as apprioriate)"
-  echo "  (optionally substitute any tag name (after -t) that is appropriate) "
+  echo " If you are using the default config locations (used/created by the configBuilder.sh script), then the following command would be correct:"
+  echo "          docker build --rm -t my/shibb-idp-tier ."
+  echo ""
+  echo " If you have an existing config or otherwise need to supply non-default paths for your config bits, "
+  echo "      that can be done by overriding the default values in the build command like this "
+  echo "      (the values below are all the default values - modify as appropriate):"
   echo ""
   echo "          docker build --rm -t my/shibb-idp-tier --build-arg TOMCFG=config/tomcat \\
 			           --build-arg TOMLOG=logs/tomcat \\
@@ -546,13 +549,13 @@ else
                       -v ${PWD}/${TOMWWWROOT}:/usr/local/tomcat/webapps/ROOT \\
                       -v ${PWD}/${TOMLOG}:/usr/local/tomcat/logs \\
                       -v ${PWD}/${TOMCERT}:/opt/certs \\
-                      -v ${PWD}/${SHBCFG}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/conf \\
-                      -v ${PWD}/${SHBCREDS}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/credentials \\
-                      -v ${PWD}/${SHBVIEWS}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/views \\
-                      -v ${PWD}/${SHBEDWAPP}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/edit-webapp \\
-                      -v ${PWD}/${SHBMSGS}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/messages \\
-                      -v ${PWD}/${SHBMD}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/metadata \\
-                      -v ${PWD}/${SHBLOG}:/opt/shibboleth/shibboleth-identity-provider-3.3.1/logs \\
+                      -v ${PWD}/${SHBCFG}:/opt/shibboleth-idp/conf \\
+                      -v ${PWD}/${SHBCREDS}:/opt/shibboleth-idp/credentials \\
+                      -v ${PWD}/${SHBVIEWS}:/opt/shibboleth-idpviews \\
+                      -v ${PWD}/${SHBEDWAPP}:/opt/shibboleth-idp/edit-webapp \\
+                      -v ${PWD}/${SHBMSGS}:/opt/shibboleth-idp/messages \\
+                      -v ${PWD}/${SHBMD}:/opt/shibboleth-idp/metadata \\
+                      -v ${PWD}/${SHBLOG}:/opt/shibboleth-idp/logs \\
                    my/shibb-idp-tier"