Merge branch 'master' of github.internet2.edu:docker/grouper into tes…

…t-changes
skoranda · May 21, 2018 · 825494a · 825494a
2 parents bbbda9d + 0b4ceb8
commit 825494a
Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 }  
              }
         }    
-        stage('Build') {
+        stage('Clean') {
             steps {
                 script {
                    try{
@@ -45,11 +45,15 @@ pipeline {
                 }
             }
         } 
-        stage('Push') {
+        stage('Build') {
             steps {
                 script {
                    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
                       def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+                      // test the environment 
+                      sh 'cd test-compose && ./compose.sh'
+                      // bring down after testing
+                      sh 'cd test-compose && docker-compose down'
                       baseImg.push("$tag")
                    }
                }

diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
 
 grouperInstaller.autorun.installAllPatches = false
 grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_104,grouper_v2_3_0_ui_patch_42,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_106,grouper_v2_3_0_ui_patch_43,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
 
 #### set this to true to try to use defaults for everything.  Only things without default values will need to be set
 grouperInstaller.autorun.useDefaultsAsMuchAsAvailable = true

diff --git a/container_files/usr-local-bin/daemon b/container_files/usr-local-bin/daemon
@@ -4,6 +4,6 @@
 
 prepDaemon
 
-export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
+export GSH_JVMARGS="$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
 
 exec bin/gsh -loader > /tmp/loggrouper
diff --git a/container_files/usr-local-bin/gsh b/container_files/usr-local-bin/gsh
@@ -4,6 +4,6 @@
 
 prepDaemon
 
-export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
+export GSH_JVMARGS="$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN"
 
 exec bin/gsh "$@" | tee /tmp/loggrouper
diff --git a/test-compose/data/container_files/seed-data/ds-setup.inf b/test-compose/data/container_files/seed-data/ds-setup.inf
@@ -1,5 +1,5 @@
 [General]
-AdminDomain = example.edu
+AdminDomain = internet2.edu
 ConfigDirectoryAdminID = admin
 ConfigDirectoryAdminPwd = admin
 ConfigDirectoryLdapURL = ldap://localhost:389/o=NetscapeRoot

diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
@@ -198,6 +198,9 @@ services:
     ports:
      - "389:389"
      - "3306:3306"
+    volumes:
+     - grouper_mysql:/var/lib/mysql  
+     - grouper_ldap:/var/lib/dirsrv
 
 
   idp:
@@ -249,3 +252,10 @@ secrets:
     file: ./configs-and-secrets/grouper/subject.properties
   sp-key.pem:
     file: ./configs-and-secrets/shibboleth/sp-key.pem
+
+
+volumes:
+  grouper_mysql:
+    driver: local
+  grouper_ldap:  
+    driver: local