Merge pull request #48 from internet2/grouper-2.5-update

Grouper 2.5 update
internet2 · Dec 10, 2020 · 78a3dff · 78a3dff
2 parents c370f7a + 51db1b4
commit 78a3dff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/Workbench/grouper_daemon/container_files/usr-local-bin/startup.sh b/Workbench/grouper_daemon/container_files/usr-local-bin/startup.sh
diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile
@@ -9,6 +9,7 @@ RUN yum install -y epel-release \
     && rm -rf /var/cache/yum
 
 COPY container_files/conf/ /opt/grouper/grouperWebapp/WEB-INF/classes/
+COPY container_files/bootstrap/ /tmp/
 
 RUN ln -s /usr/bin/resolveip /usr/libexec/resolveip
 
@@ -29,7 +30,8 @@ RUN mysql_install_db \
 
 RUN (mysqld_safe & ) \
     && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 1; done; \
-    /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh -registry -check -runscript -noprompt
+    /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh -registry -check -runscript -noprompt && \
+    /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh /tmp/initialize.sh
 
 EXPOSE 3306
 

diff --git a/...daemon/container_files/tmp/initialize.gsh → .../container_files/bootstrap/initialize.gsh b/...daemon/container_files/tmp/initialize.gsh → .../container_files/bootstrap/initialize.gsh