bug fixes

Dockerfile

@@ -34,20 +34,6 @@ ENV PATH=$CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
 ENV SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION
 ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION
 
-# ensure the following locations are accurate if you plan to burn your configuration into your containers by uncommenting the relevant section below
-# they represent the folder names/paths on your build host of the relevant config material needed to run the container
-ARG TOMCFG=$PWD/config/tomcat
-ARG TOMLOG=$PWD/logs/tomcat
-ARG TOMCERT=$PWD/credentials/tomcat
-ARG TOMWWWROOT=$PWD/wwwroot
-ARG SHBCFG=$PWD/config/shib-idp/conf
-ARG SHBCREDS=$PWD/credentials/shib-idp
-ARG SHBVIEWS=$PWD/config/shib-idp/views
-ARG SHBEDWAPP=$PWD/config/shib-idp/edit-webapp
-ARG SHBMSGS=$PWD/config/shib-idp/messages
-ARG SHBMD=$PWD/config/shib-idp/metadata
-ARG SHBLOG=$PWD/logs/shib-idp
-
 #set labels
 LABEL Vendor="Internet2"
 LABEL ImageType="Shibboleth IDP Release"
@@ -207,15 +193,31 @@ VOLUME ["/usr/local/tomcat/conf", \
 # consider not doing the volumes below as it creates a run-time dependency and a better solution might be to use syslog from the container
 # VOLUME ["/usr/local/tomcat/logs", "/opt/shibboleth-idp/logs"]
 #
-## COPY ${TOMCFG} /usr/local/tomcat/conf
-## COPY ${TOMCERT} /opt/certs
-## COPY ${TOMWWWROOT} /usr/local/tomcat/webapps/ROOT
-## COPY ${SHBCFG} /opt/shibboleth/shibboleth-identity-provider-$VERSION/conf
-## COPY ${SHBCREDS} /opt/shibboleth/shibboleth-identity-provider-$VERSION/credentials
-## COPY ${SHBVIEWS} /opt/shibboleth/shibboleth-identity-provider-$VERSION/views
-## COPY ${SHBEDWAPP} /opt/shibboleth/shibboleth-identity-provider-$VERSION/edit-webapp
-## COPY ${SHBMSGS} /opt/shibboleth/shibboleth-identity-provider-$VERSION/messages
-## COPY ${SHBMD} /opt/shibboleth/shibboleth-identity-provider-$VERSION/metadata
+# ensure the following locations are accurate if you plan to burn your configuration into your containers by uncommenting the relevant section below
+# they represent the folder names/paths on your build host of the relevant config material needed to run the container
+# The paths below must be relative to (subdirectories of) the directory where the Dockerfile is located.
+# The paths below are just the default values.  They are typically overriden by "build-args" in the 'docker build' command.
+ARG TOMCFG=config/tomcat
+ARG TOMLOG=logs/tomcat
+ARG TOMCERT=credentials/tomcat
+ARG TOMWWWROOT=wwwroot
+ARG SHBCFG=config/shib-idp/conf
+ARG SHBCREDS=credentials/shib-idp
+ARG SHBVIEWS=config/shib-idp/views
+ARG SHBEDWAPP=config/shib-idp/edit-webapp
+ARG SHBMSGS=config/shib-idp/messages
+ARG SHBMD=config/shib-idp/metadata
+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
 
 # Expose the port tomcat will be serving on
 EXPOSE 8443

configBuilder.sh

@@ -470,8 +470,8 @@ if [ ${BURNMOUNT} == "burn" ]; then
 
   mv -f Dockerfile Dockerfile.setup
   cat <<EOF > docker_edit.sed
-s/^## COPY /COPY /
-s/^VOLUME /## VOLUME /
+s/^## ADD /ADD /
+/^VOLUME/,+10 s/^/#/
 EOF
   sed -f docker_edit.sed Dockerfile.setup > Dockerfile
   rm -f Dockerfile.setup
@@ -508,7 +508,7 @@ 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 setup-config.sh script), then the following command would be correct."
+  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 ""