From 9d4399d28c30d7d549f2cb2dcbad3bba8f263eed Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 12 May 2017 18:30:25 -0500 Subject: [PATCH] update readme, minor script fix --- README.md | 40 +++++++++++++++++++++++++++++++++++++++- setup-config.sh | 42 +++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 7d5029d..b109c0e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,40 @@ # shib-idp_noVM -Used for building/running a TIER Shibb-IdP container without the TIER VM +Used for building/running a TIER Shibb-IdP container without the TIER VM. + +If you have an existing configuration, you can use it as follows (these are examples only, adjust as appropriate): + +**For a container with a "burned-in" configuration (you must supply the config at build-time): +BUILD: + docker build --rm -t my/shibb-idp-tier --build-arg TOMCFG=config/tomcat \ + --build-arg TOMLOG=logs/tomcat \ + --build-arg TOMCERT=credentials/tomcat \ + --build-arg TOMWWWROOT=wwwroot \ + --build-arg SHBCFG=config/shib-idp/conf \ + --build-arg SHBCREDS=credentials/shib-idp \ + --build-arg SHBVIEWS=config/shib-idp/views \ + --build-arg SHBEDWAPP=config/shib-idp/edit-webapp \ + --build-arg SHBMSGS=config/shib-idp/messages \ + --build-arg SHBMD=config/shib-idp/metadata \ + --build-arg SHBLOG=logs/shib-idp . + +RUN: + docker run -d --name shib-test1 -p 8443:8443 my/shibb-idp-tier + + +**For a container with a "mounted" configuration (you must supply the config at run-time): +BUILD: + docker build --rm -t my/shibb-idp-tier . + +RUN: + docker run -d --name shib-idp -p 8443:8443 -v /home/shibboleth/conf/tomcat-test:/usr/local/tomcat/conf \ + -v /home/shibboleth/build/shibboleth_idp/www:/usr/local/tomcat/webapps/ROOT \ + -v /home/shibboleth/logs/tomtest1:/usr/local/tomcat/logs \ + -v /home/shibboleth/build/shibboleth_idp/certs:/opt/certs \ + -v /home/shibboleth/build/shibboleth_idp/root/conf:/opt/shibboleth/shibboleth-identity-provider-3.3.1/conf \ + -v /home/shibboleth/build/shibboleth_idp/root/credentials:/opt/shibboleth/shibboleth-identity-provider-3.3.1/credentials \ + -v /home/shibboleth/build/shibboleth_idp/root/views:/opt/shibboleth/shibboleth-identity-provider-3.3.1/views \ + -v /home/shibboleth/build/shibboleth_idp/root/edit-webapp:/opt/shibboleth/shibboleth-identity-provider-3.3.1/edit-webapp \ + -v /home/shibboleth/build/shibboleth_idp/root/messages:/opt/shibboleth/shibboleth-identity-provider-3.3.1/messages \ + -v /home/shibboleth/build/shibboleth_idp/root/metadata:/opt/shibboleth/shibboleth-identity-provider-3.3.1/metadata \ + -v /home/shibboleth/logs/idptest1:/opt/shibboleth/shibboleth-identity-provider-3.3.1/logs \ +my/shibb-idp-tier diff --git a/setup-config.sh b/setup-config.sh index a915694..bb98528 100644 --- a/setup-config.sh +++ b/setup-config.sh @@ -499,16 +499,16 @@ if [ ${BURNMOUNT} == "burn" ]; then echo " (substitute paths for your own environment as apprioriate)" echo " (optionally substitute any tag name (after -t) that is appropriate) " echo "" - echo " docker build --rm -t my/shibb-idp-tier --build-arg TOMCFG=config/tomcat - --build-arg TOMLOG=logs/tomcat - --build-arg TOMCERT=credentials/tomcat - --build-arg TOMWWWROOT=wwwroot - --build-arg SHBCFG=config/shib-idp/conf - --build-arg SHBCREDS=credentials/shib-idp - --build-arg SHBVIEWS=config/shib-idp/views - --build-arg SHBEDWAPP=config/shib-idp/edit-webapp - --build-arg SHBMSGS=config/shib-idp/messages - --build-arg SHBMD=config/shib-idp/metadata + echo " docker build --rm -t my/shibb-idp-tier --build-arg TOMCFG=config/tomcat \\ + --build-arg TOMLOG=logs/tomcat \\ + --build-arg TOMCERT=credentials/tomcat \\ + --build-arg TOMWWWROOT=wwwroot \\ + --build-arg SHBCFG=config/shib-idp/conf \\ + --build-arg SHBCREDS=credentials/shib-idp \\ + --build-arg SHBVIEWS=config/shib-idp/views \\ + --build-arg SHBEDWAPP=config/shib-idp/edit-webapp \\ + --build-arg SHBMSGS=config/shib-idp/messages \\ + --build-arg SHBMD=config/shib-idp/metadata \\ --build-arg SHBLOG=logs/shib-idp ." echo "" echo "" @@ -529,17 +529,17 @@ else echo "RUN" echo " For a mounted config, you will need to supply your config locations at run-time, like this (assuming the default locations for the local config)." echo "" - echo " docker run -d --name shib-test1 -p 8443:8443 -v /home/shibboleth/conf/tomcat-test:/usr/local/tomcat/conf - -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 + echo " docker run -d --name shib-test1 -p 8443:8443 -v /home/shibboleth/conf/tomcat-test:/usr/local/tomcat/conf \\ + -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 \\ my/shibb-idp-tier"