From b4f86a52f380202ae00d21d17bd992d4e47e37b3 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Tue, 8 May 2018 09:42:59 -0700 Subject: [PATCH 01/16] Update gsh --- container_files/usr-local-bin/gsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/usr-local-bin/gsh b/container_files/usr-local-bin/gsh index 0539b40a..e65979ab 100755 --- 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 From 269044d7c3fc5f9a6889d7067c4272e25a637045 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Tue, 8 May 2018 09:46:05 -0700 Subject: [PATCH 02/16] Update daemon --- container_files/usr-local-bin/daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/usr-local-bin/daemon b/container_files/usr-local-bin/daemon index 27f3da63..87d6aace 100755 --- 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 From 897c9dbf58b7ddc092e7ebe0b5ba3a36a9d157d8 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 8 May 2018 10:42:07 -0700 Subject: [PATCH 03/16] persistent volumes for mysql and ldap --- test-compose/docker-compose.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index b4547273..b88a3204 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -210,6 +210,9 @@ services: ports: - "389:389" - "3306:3306" + volumes: + - grouper_mysql: /var/lib/mysql + - grouper_ldap: /var/lib/dirsrv idp: @@ -261,3 +264,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 From d32b03ec6e2f5d9455e9e8579245f4cc8afd5c90 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 8 May 2018 10:52:15 -0700 Subject: [PATCH 04/16] Update docker-compose.yml --- test-compose/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index b88a3204..b1bcaa91 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -211,8 +211,8 @@ services: - "389:389" - "3306:3306" volumes: - - grouper_mysql: /var/lib/mysql - - grouper_ldap: /var/lib/dirsrv + - grouper_mysql:/var/lib/mysql + - grouper_ldap:/var/lib/dirsrv idp: From 1df10e8aac240200e81a184cbf46b719b6e2c910 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Wed, 16 May 2018 08:24:47 -0700 Subject: [PATCH 05/16] wait for ldap to start --- test-compose/data/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile index 35317837..a90e4017 100644 --- a/test-compose/data/Dockerfile +++ b/test-compose/data/Dockerfile @@ -36,7 +36,7 @@ RUN useradd ldapadmin \ && sed -i '/if (@errs = startServer($inf))/,/}/d' /usr/lib64/dirsrv/perl/* \ && setup-ds.pl --silent --file /seed-data/ds-setup.inf \ && /usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir \ - && sleep 3 \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ && ldapadd -H ldap:/// -f /seed-data/users.ldif -x -D "cn=Directory Manager" -w password RUN (/usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir &) \ From 789ac599d8ee918584b4cb8d9bf12b8031a72be1 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Wed, 16 May 2018 08:25:39 -0700 Subject: [PATCH 06/16] Update docker-compose.yml --- test-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index b1bcaa91..ab5810f9 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.3" services: daemon: build: ./daemon/ - command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; exec daemon" + command: bash -c "while ! curl -s data:3306 > /dev/null; do echo waiting for mysql to start; sleep 3; done; while ! curl -s ldap://data:389 > /dev/null; do echo waiting for ldap to start; sleep 3; done; exec daemon" depends_on: - data environment: From a5a934356b42605e26b51b60c2c26d21abdd4a95 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Wed, 16 May 2018 08:34:37 -0700 Subject: [PATCH 07/16] Update Dockerfile --- test-compose/data/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile index a90e4017..85b4e261 100644 --- a/test-compose/data/Dockerfile +++ b/test-compose/data/Dockerfile @@ -37,7 +37,7 @@ RUN useradd ldapadmin \ && setup-ds.pl --silent --file /seed-data/ds-setup.inf \ && /usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir \ && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ - && ldapadd -H ldap:/// -f /seed-data/users.ldif -x -D "cn=Directory Manager" -w password + ldapadd -H ldap:/// -f /seed-data/users.ldif -x -D "cn=Directory Manager" -w password RUN (/usr/sbin/ns-slapd -D /etc/dirsrv/slapd-dir &) \ && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ From aa40fc2638bfc64690f217ec6068a08322167578 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 May 2018 11:48:42 -0400 Subject: [PATCH 08/16] 2.3.0-a106-u43-w12-p16 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 --- container_files/grouper.installer.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties index dfd3ac5e..ef3e7b55 100644 --- 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 From ec764d00eb2b1adcba863bb6fdaa6b0d9383e7fc Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 11:43:53 -0400 Subject: [PATCH 09/16] Update daemon --- container_files/usr-local-bin/daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container_files/usr-local-bin/daemon b/container_files/usr-local-bin/daemon index 87d6aace..da40d1e6 100755 --- a/container_files/usr-local-bin/daemon +++ b/container_files/usr-local-bin/daemon @@ -4,6 +4,6 @@ prepDaemon -export GSH_JVMARGS="$$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN" +export GSH_JVMARGS="$GSH_JVMARGS -DENV=$ENV -DUSERTOKEN=$USERTOKEN" exec bin/gsh -loader > /tmp/loggrouper From 2abfbfb9490ae3b819bf0051e8e24fecf9b80231 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 12:20:00 -0400 Subject: [PATCH 10/16] try test-compose after build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e9c2315c..f49479e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,6 +50,7 @@ pipeline { script { docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") { def baseImg = docker.build("$maintainer/$imagename", "--no-cache .") + sh 'cd test-compose && ./compose/sh' baseImg.push("$tag") } } From b256a937f2992e98d1a508046b798ff244fa808a Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 12:21:20 -0400 Subject: [PATCH 11/16] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f49479e8..da00818f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ pipeline { script { docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") { def baseImg = docker.build("$maintainer/$imagename", "--no-cache .") - sh 'cd test-compose && ./compose/sh' + sh 'cd test-compose && ./compose.sh' baseImg.push("$tag") } } From 5bf134bf48621d04956119d58a8fddfa0736a911 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 14:26:39 -0400 Subject: [PATCH 12/16] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index da00818f..b7ada966 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,6 +51,7 @@ pipeline { docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") { def baseImg = docker.build("$maintainer/$imagename", "--no-cache .") sh 'cd test-compose && ./compose.sh' + sh 'cd test-compose && docker-compose down' baseImg.push("$tag") } } From bac85a4a0f75b5fb44db44bd867340142e17266e Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 14:28:16 -0400 Subject: [PATCH 13/16] Update Jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7ada966..8cb90349 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { } } } - stage('Build') { + stage('Clean') { steps { script { try{ @@ -45,12 +45,14 @@ 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") } From 00b49d961342cf036f1c3ea37463ffeeda9f789e Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 16:01:16 -0400 Subject: [PATCH 14/16] testing a failure condition will be reverted --- test-compose/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index ab5810f9..2274c777 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -1,3 +1,5 @@ +this should blow up +asdfasdfasdfsadf version: "3.3" services: From 13c7a1b861d3b7583af0ef28a8ef34998daa16f0 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 17 May 2018 16:16:22 -0400 Subject: [PATCH 15/16] reverting intentional failure --- test-compose/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index 2274c777..ab5810f9 100644 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -1,5 +1,3 @@ -this should blow up -asdfasdfasdfsadf version: "3.3" services: From 2f80c0fe3b2f44c681e3bd6ae79dbf053661e367 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Fri, 18 May 2018 13:23:51 -0400 Subject: [PATCH 16/16] change example.edu to internet2.edu --- test-compose/data/container_files/seed-data/ds-setup.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/data/container_files/seed-data/ds-setup.inf b/test-compose/data/container_files/seed-data/ds-setup.inf index ae365ca4..9eef33c4 100644 --- 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