Merge pull request #14 from docker/issue11

Issue11
docker · Nov 22, 2016 · 1cb4b76 · 1cb4b76
2 parents 64b98fb + 798d17a
commit 1cb4b76
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,6 +39,7 @@ RUN mkdir -p /opt/grouper/$VERSION \
     cp /opt/etc/grouper.hibernate.pointer.properties /opt/grouper/$version/grouper.ws-$version/grouper-ws/build/dist/grouper-ws/WEB-INF/classes/grouper.hibernate.properties && \
     rm /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
     cp /opt/etc/grouper.hibernate.pointer.properties /opt/grouper/$version/grouper.ui-$version/dist/grouper/WEB-INF/classes/grouper.hibernate.properties && \
+    ln -sf /opt/bin/run.sh /usr/local/bin/run.sh && \
     updatedb
 
     #/opt/grouper/2.3.0/grouper.apiBinary-2.3.0/conf/grouper.hibernate.properties

diff --git a/container_files/bin/configure.sh b/container_files/bin/configure.sh
@@ -25,3 +25,9 @@ sed -i "s|#MYSQL_DATABASE#|$MYSQL_DATABASE|g" /opt/etc/grouper.properties >> $lo
 cat /opt/etc/grouper.hibernate.properties >> $log
 
 cat /opt/etc/grouper.properties >> $log
+
+#Configure gsh loader
+sed -i "1s|^|\n |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log
+sed -i "1s|^|PWD=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log
+sed -i "1s|^|\n |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh >> $log
+sed -i "1s|^|GROUPER_HOME=/opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/ |" /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh  >> $log
diff --git a/container_files/bin/run.sh b/container_files/bin/run.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+while true; do
+sleep 1800
+done
diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh
@@ -20,7 +20,9 @@ then
       echo "Starting tomcat and apache"
       /opt/autoexec/bin/firstrun.sh
       /usr/local/bin/httpd-shib-foreground &
-      /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run 
+      /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run &
+      /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader &
+      /usr/local/bin/run.sh
   fi
 else
   echo "Composed so waiting for MariaDB: " > $log
@@ -54,6 +56,8 @@ else
       /opt/autoexec/bin/firstrun.sh
       date >> $log
       /usr/local/bin/httpd-shib-foreground &
-      /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run 
+      /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run &
+      /opt/grouper/$VERSION/grouper.apiBinary-$VERSION/bin/gsh -loader &
+      /usr/local/bin/run.sh
   fi
 fi