edit dockerfile to run gsh while building container

ex101/ex101.1.1/Dockerfile

@@ -14,8 +14,10 @@ COPY container_files/grouper-loader.properties /opt/grouper/grouperWebapp/WEB-IN
 COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/classes/
 COPY container_files/morphString.properties /opt/grouper/grouperWebapp/WEB-INF/classes/
 
+# && setupFiles; \
+
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.1.1/Dockerfile

@@ -14,8 +14,9 @@ COPY container_files/grouper-loader.properties /opt/grouper/grouperWebapp/WEB-IN
 COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 COPY container_files/morphString.properties /opt/grouper/grouperWebapp/WEB-INF/classes/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.1.end/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.1.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.2.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.2.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.2.end/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.2.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.3.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.3.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.3.end/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.3.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.4.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.4.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.4.end/Dockerfile

@@ -12,8 +12,9 @@ ENV USERTOKEN=gte-201.4.end
 COPY container_files/seed-data/ /seed-data/
 COPY container_files/attribute-filter.xml /opt/shibboleth-idp/conf/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.5.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.5.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex201/ex201.5.end/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-201.5.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex211/ex211.1.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-211.1.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex301/ex301.4.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-301.4.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.1.1/Dockerfile

@@ -16,8 +16,9 @@ COPY container_files/subject.properties /opt/grouper/grouperWebapp/WEB-INF/class
 COPY container_files/morphString.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 COPY container_files/grouper.properties /opt/grouper/grouperWebapp/WEB-INF/classes
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.1.2/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.2
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.1.3/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.3
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.1.4/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.4
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.1.5/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.5
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.1.end/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.1.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.2/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.2
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.3/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.3
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.4/Dockerfile

@@ -12,8 +12,9 @@ ENV USERTOKEN=gte-401.2.4
 COPY container_files/seed-data/ /seed-data/
 COPY container_files/idp/ /opt/shibboleth-idp/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.5/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.5
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.6/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.6
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.7/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.7
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.8/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.8
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.9/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.9
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.2.end/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.2.end
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.1/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.1
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.2/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.2
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.3/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.3
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.4/Dockerfile

@@ -12,8 +12,9 @@ ENV USERTOKEN=gte-401.3.4
 COPY container_files/seed-data/ /seed-data/
 COPY container_files/attribute-filter.xml /opt/shibboleth-idp/conf/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.5/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.5
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.6/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.6
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \

ex401/ex401.3.7/Dockerfile

@@ -11,8 +11,9 @@ ENV USERTOKEN=gte-401.3.7
 
 COPY container_files/seed-data/ /seed-data/
 
+#  && setupFiles
 RUN . /usr/local/bin/library.sh \
-    && prep_conf && prep_finish && setupFiles; \
+    && prep_conf && prep_finish; \
     (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \
     && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
     (mysqld_safe & ) \