From 0e5de1fa01b533f8537b6f4d6c944bb67ecbe956 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Mon, 2 Jul 2018 13:23:34 -0700 Subject: [PATCH 1/4] Update grouper-www.conf --- container_files/httpd/grouper-www.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf index 368f7f6c..f3026337 100644 --- a/container_files/httpd/grouper-www.conf +++ b/container_files/httpd/grouper-www.conf @@ -11,6 +11,5 @@ ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim timeout=2400 AuthType shibboleth ShibRequestSetting requireSession 1 ShibRequireSession on - ShibUseHeaders On require shibboleth From 04a2e88b696e0a24d5629d5fdc7858384967065c Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 2 Jul 2018 21:52:33 -0400 Subject: [PATCH 2/4] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8cb90349..2d04b2f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,7 +53,8 @@ pipeline { // test the environment sh 'cd test-compose && ./compose.sh' // bring down after testing - sh 'cd test-compose && docker-compose down' + sh 'cd test-compose && docker-compose kill' + sh 'cd test-compose && docker-compose rm' baseImg.push("$tag") } } From 62700617c9fc02f423ae04ac3bd961866af73bdd Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 2 Jul 2018 22:27:11 -0400 Subject: [PATCH 3/4] Update Jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2d04b2f1..d933f0a1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,8 +53,10 @@ pipeline { // test the environment sh 'cd test-compose && ./compose.sh' // bring down after testing - sh 'cd test-compose && docker-compose kill' - sh 'cd test-compose && docker-compose rm' + sh 'cd test-compose && docker-compose down' + sh 'docker rm $(docker ps -q -f status=exited)' + sh 'docker volume rm $(docker volume ls -qf dangling=true' + sh 'docker rmi $(docker images --filter "dangling=true" -q --no-trunc)' baseImg.push("$tag") } } From 9b7329cf5c83db341dc4a0b4c5cf396e265d94c4 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 3 Jul 2018 08:01:29 -0400 Subject: [PATCH 4/4] Update Jenkinsfile --- Jenkinsfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d933f0a1..4c10d429 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,10 +53,7 @@ pipeline { // test the environment sh 'cd test-compose && ./compose.sh' // bring down after testing - sh 'cd test-compose && docker-compose down' - sh 'docker rm $(docker ps -q -f status=exited)' - sh 'docker volume rm $(docker volume ls -qf dangling=true' - sh 'docker rmi $(docker images --filter "dangling=true" -q --no-trunc)' + sh 'cd test-compose && docker-compose down --volumes --remove-orphans --rmi local' baseImg.push("$tag") } }