Skip to content

Commit

Permalink
Merge pull request #29 from docker/CB-0.5
Browse files Browse the repository at this point in the history
bugfixes
  • Loading branch information
pcaskey authored Feb 12, 2020
2 parents db240dd + 0ceabba commit a860ad1
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 347 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ ADD ${TOMCERT} /opt/certs
ADD ${TOMWWWROOT} /usr/local/tomcat/webapps/ROOT
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 ${SHBVIEWS} /opt/shibboleth-idp/views
#ADD ${SHBEDWAPP} /opt/shibboleth-idp/edit-webapp
#ADD ${SHBMSGS} /opt/shibboleth-idp/messages
ADD ${SHBMD} /opt/shibboleth-idp/metadata


6 changes: 3 additions & 3 deletions Dockerfile.windows.template
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ ADD $TOMCERT c:\\opt\\certs
ADD $TOMWWWROOT c:\\Tomcat\\webapps\\ROOT
ADD $SHBCFG c:\\opt\\shibboleth-idp\\conf
ADD $SHBCREDS c:\\opt\\shibboleth-idp\\credentials
ADD $SHBVIEWS c:\\opt\\shibboleth-idp\\views
ADD $SHBEDWAPP c:\\opt\\shibboleth-idp\\edit-webapp
ADD $SHBMSGS c:\\opt\\shibboleth-idp\\messages
#ADD $SHBVIEWS c:\\opt\\shibboleth-idp\\views
#ADD $SHBEDWAPP c:\\opt\\shibboleth-idp\\edit-webapp
#ADD $SHBMSGS c:\\opt\\shibboleth-idp\\messages
ADD $SHBMD c:\\opt\\shibboleth-idp\\metadata

# Uncomment if using secrets; removes existing files from the container so that secrets can propagate (issue with Windows containers)
Expand Down
2 changes: 1 addition & 1 deletion common.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ registry="docker.io"
maintainer="tier"
basename="shibbidp_configbuilder_container"
imagename="shibbidp_configbuilder_container"
version="0.4"
version="0.5"
Loading

0 comments on commit a860ad1

Please sign in to comment.