minor cleanup

docker · Feb 12, 2020 · f27bf4763a6d0b0c0051669a58e9a576bcb15a60 · f27bf47
1 parent 9f7dd5e
commit f27bf4763a6d0b0c0051669a58e9a576bcb15a60
Unified Split

Showing with 7 additions and 9 deletions.

+3 −3 Dockerfile.template

+3 −3 Dockerfile.windows.template

+1 −1 common.bash

+0 −2 configBuilder.sh
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -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
 
 
diff --git a/Dockerfile.windows.template b/Dockerfile.windows.template
@@ -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)

diff --git a/common.bash b/common.bash
@@ -2,4 +2,4 @@ registry="docker.io"
 maintainer="tier"
 basename="shibbidp_configbuilder_container"
 imagename="shibbidp_configbuilder_container"
-version="0.4"
+version="0.5"
diff --git a/configBuilder.sh b/configBuilder.sh
@@ -445,8 +445,6 @@ WINDOWS | windows)
 esac
 
 
-# if the user chose to use secrets, then generate a directory containing the config with secrets removed
-
 #copy files directly instead of zipping
 mkdir -p /output-tmp
 cp -R ./* /output-tmp