diff --git a/Workbench/grouper_daemon/container_files/usr-local-bin/startup.sh b/Workbench/grouper_daemon/container_files/usr-local-bin/startup.sh deleted file mode 100755 index ef7c99c..0000000 --- a/Workbench/grouper_daemon/container_files/usr-local-bin/startup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [[ -e /tmp/initialize.gsh ]] -then - echo Executing /tmp/initialize.gsh on the first start - /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh /tmp/initialize.gsh - rm /tmp/initialize.gsh -else - echo Skipping execution of /tmp/initialize.gsh as it is not present -fi - -daemon diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile index 56d49be..ac69426 100644 --- 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/Workbench/grouper_daemon/container_files/tmp/initialize.gsh b/Workbench/grouper_data/container_files/bootstrap/initialize.gsh similarity index 100% rename from Workbench/grouper_daemon/container_files/tmp/initialize.gsh rename to Workbench/grouper_data/container_files/bootstrap/initialize.gsh