Removed supervisord

Dockerfile

@@ -29,19 +29,15 @@ RUN mkdir -p /opt/grouper/$VERSION \
         java-1.8.0-openjdk \
         java-1.8.0-openjdk-devel \
         MariaDB-client \
-        supervisor \
         mlocate \
       && yum clean all
 
 # The installer creates a HSQL DB which we ignore later
 
-RUN mkdir -p /var/log/supervisor
-RUN mv /etc/supervisord.conf /etc/supervisord.conf.old
-COPY container_files/conf/supervisord.conf /etc
 WORKDIR /opt/grouper/$version
 RUN java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
 
 VOLUME /opt/grouper/2.3.0/apache-tomcat-$TOMCAT_VERSION/logs
 
-EXPOSE 8080 8009 8005 9001
-CMD ["/usr/bin/supervisord"]
+EXPOSE 8080 8009 8005 
+CMD ["/opt/bin/start.sh"]

container_files/bin/main.sh

@@ -20,4 +20,4 @@ else
     echo "Grouper container has run." >> $log
     echo "If there are problems, docker rm this container and try again." >> $log
 fi
-exit 0
+#exit 0

container_files/bin/start.sh

@@ -13,33 +13,43 @@ then
       echo "Not composed non-zero exit status: $laststatus"
       exit 1
   else
+      echo "Grouper was configured" >>$log
       echo "Grouper was configured"
-      echo "Starting apache"
-      exit 0
-      #/usr/local/bin/httpd-shib-foreground
+      echo "Starting tomcat and apache" >>$log
+      echo "Starting tomcat and apache"
+      /usr/local/bin/httpd-shib-foreground &
+      /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run 
   fi
 else
   echo "Composed so waiting for MariaDB: " > $log
+  date >> $log
   echo "Testing connectivy to database before continue with install"
   mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -h "$MYSQL_HOST" -e "use grouper; show tables;"
   laststatus="$?"
+  echo "checking connectivity" >> $log
   while [ "$laststatus" != "0" ]; do
   mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -h "$MYSQL_HOST" -e "use grouper; show tables;"
   laststatus="$?"
   sleep 5
+  date >> $log
   echo "Trying to connect to mariadb container with $MYSQL_USER to database $MYSQL_DATABASE"
+  echo "Trying to connect to mariadb container with $MYSQL_USER to database $MYSQL_DATABASE" >> $log
   done
   /opt/bin/main.sh
   laststatus="$?"
   echo "Composed status: $laststatus"
+  echo "Composed status: $laststatus" >>$log
   if [ "$laststatus" != "0" ]; then
       echo "Composed non-zero exit status: $laststatus" >> $log
       echo "Composed non-zero exit status: $laststatus"
       exit 1
   else
+      echo "Grouper was configured" >>$log
       echo "Grouper was configured"
-      echo "Starting apache"
-      exit 0
-      #/usr/local/bin/httpd-shib-foreground
+      echo "Starting tomcat and apache" >>$log
+      echo "Starting tomcat and apache"
+      date >> $log
+      /usr/local/bin/httpd-shib-foreground &
+      /opt/grouper/2.3.0/apache-tomcat-6.0.35/bin/catalina.sh run 
   fi
 fi