More potency in the setup

container_files/bin/check.sh

@@ -2,4 +2,9 @@
 
 log="/tmp/grouper.log"
 
-cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -check >> $log
+
+cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -drop -runscript -noprompt
+
+cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 bin/gsh.sh -registry -runsqlfile /opt/grouper/2.3.0/subjects.sql -noprompt
+
+cd /opt/grouper/2.3.0/grouper.apiBinary-2.3.0 && GROUPER_HOME=/opt/grouper/2.3.0/grouper.apiBinary-2.3.0 CLASSPATH=/opt/etc:$CLASSPATH bin/gsh.sh -registry -check >> $log

container_files/etc/grouper.installer.properties

@@ -33,4 +33,13 @@ grouperInstaller.autorun.deleteAndInitDatabase = t
 # autorun What is the location of your tomcat server.xml for the UI?
 # Note, if you dont use tomcat just leave it blank or type 'blank':
 grouperInstaller.autorun.locationOfTomcatServerXml = /home/grouper/2.3.0/apache-tomcat-6.0.35/conf/server.xml
+
+# [jvf] The 'fake' run-through of 
+# While running the installer, we don't have access to the database
+#grouperInstaller.autorun.deleteAndInitDatabase = f
+
+# While running the installer, we don't have access to the database
+#grouperInstaller.autorun.addQuickstartSubjectsToDb = f
+
+# grouperInstaller.autorun.addQuickstartData = f
 

tests/image.bats

@@ -38,3 +38,18 @@ load ../common
   docker run -i $maintainer/$imagename find /opt/grouper/$version/grouper.ws-$version
 }
 
+
+# Skipping: Unknown how much reconstruction we miss this way. [jvf]
+
+@test "Database subjects not created" {
+  skip
+  docker run -i $maintainer/$imagename find /opt/grouper/$version/subjects.sql
+}
+
+@test "Database does not add quickstart data" {
+  skip
+  docker run -i $maintainer/$imagename find /opt/grouper/$version/grouper.apiBinary-$version/ddlScripts
+}
+
+
+