From 998429f9332bc7b21a484c89c844d0ab76533c24 Mon Sep 17 00:00:00 2001
From: John Gasper <jgasper@unicon.net>
Date: Mon, 30 Apr 2018 14:26:11 -0700
Subject: [PATCH 001/176] Update README.md
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index c25caeba..dc613c9e 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,7 @@ Note: a less privileged database user maybe used when running the typical Groupe
# Provisioning a Grouper Database
-Using standard methods, create a MariaDb Server and an empty Grouper database. Create a database user with privileges to create and populate schema objects. Set the appropriate database connection properties in `grouper.hibernate.properties`. Be sure to the user created with schema manipulation privileges as the db user.
+Using standard methods, create a MariaDb Server and an empty Grouper database. Create a database user with privileges to create and populate schema objects. Set the appropriate database connection properties in `grouper.hibernate.properties`. Be sure that the user is created with schema manipulation privileges.
Next populate the database by using the following command.
@@ -268,7 +268,7 @@ $ docker container run -it --rm \
tier/grouper gsh -registry -check -runscript -noprompt
```
-Also, it is possible to just connect directly to the container, create the DDL, and copy it out:
+Also, it is possible to just connect directly to the container, create the DDL, and copy it out. This is necessary if your DBAs would prefer to manually execute the DDL to create the schema objects:
```console
$ docker container run -it --name grouper \
@@ -284,7 +284,7 @@ $ docker container rm -f grouper
```
The generated DDL will be on the host in the `ddlScripts` directory.
-Note: a less privileged database user maybe used when running the typical Grouper roles. This user needs SELECT, INSERT, UPDATE, and DELETE privileges on the schema objects.
+Note: A less privileged database user maybe used when running the typical Grouper roles. This user just needs SELECT, INSERT, UPDATE, and DELETE privileges on the tables and views. Running in this configuration requires DBAs to manually run the DDL scripts.
# Configuring the embedded Shibboleth SP
From 501167ca3e7d8f330d7fe02306af3aa9377a9097 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 09:48:58 -0400
Subject: [PATCH 002/176] updating patch level
---
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 e611d249..dfd3ac5e 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_103,grouper_v2_3_0_ui_patch_42,grouper_v2_3_0_ws_patch_11,grouper_v2_3_0_pspng_patch_16
+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
#### 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 64e3953a77d22fc3769b584d5046994eaddd8821 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 10:13:32 -0400
Subject: [PATCH 003/176] Update Jenkinsfile
---
Jenkinsfile | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9715dedd..02056edd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,27 @@ pipeline {
echo "You must define an imagename in common.bash"
currentBuild.result = 'FAILURE'
}
- }
+ sh 'mkdir -p tmp'
+ dir('tmp'){
+ git([ url: "https://github.internet2.edu/docker/util.git",
+ credentialsId: "jenkins-github-access-token" ])
+ sh 'ls'
+ sh 'mv bin/* ../bin/.'
+ }
}
}
stage('Build') {
steps {
- echo 'step 2'
+ script {
+ try{
+ sh 'bin/rebuild.sh >> debug'
+ } catch(error) {
+ def error_details = readFile('./debug');
+ def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
+ sh "rm -f ./debug"
+ handleError(message)
+ }
+ }
}
}
stage('Push') {
From d9391b1793b28c2fc351133841d8f594d070f7b1 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 10:20:54 -0400
Subject: [PATCH 004/176] Update Jenkinsfile
---
Jenkinsfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 02056edd..f183d865 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,10 +23,10 @@ pipeline {
}
sh 'mkdir -p tmp'
dir('tmp'){
- git([ url: "https://github.internet2.edu/docker/util.git",
- credentialsId: "jenkins-github-access-token" ])
- sh 'ls'
- sh 'mv bin/* ../bin/.'
+ git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
+ sh 'ls'
+ sh 'mv bin/* ../bin/.'
+ }
}
}
}
@@ -63,7 +63,7 @@ pipeline {
}
post {
always {
- echo 'I will always say Hello again!'
+ echo 'Done Building.'
}
failure {
// slackSend color: 'good', message: "Build failed"
From e8eba92a540a17a04dfd12b84476f373dc5111c7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 10:23:02 -0400
Subject: [PATCH 005/176] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index f183d865..020eb0df 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,6 +21,7 @@ pipeline {
echo "You must define an imagename in common.bash"
currentBuild.result = 'FAILURE'
}
+ sh 'mkdir -p ../bin'
sh 'mkdir -p tmp'
dir('tmp'){
git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
From bfbfdd4e152916ca9c4f5c98afd566cd97586368 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 10:24:39 -0400
Subject: [PATCH 006/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 020eb0df..4ad40b94 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
echo "You must define an imagename in common.bash"
currentBuild.result = 'FAILURE'
}
- sh 'mkdir -p ../bin'
+ sh 'mkdir -p bin'
sh 'mkdir -p tmp'
dir('tmp'){
git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
From c369a62684a21d38ae20dd228bec53fa92ab241c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 2 May 2018 10:26:52 -0400
Subject: [PATCH 007/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4ad40b94..e9c2315c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
steps {
script {
try{
- sh 'bin/rebuild.sh >> debug'
+ sh 'bin/destroy.sh >> debug'
} catch(error) {
def error_details = readFile('./debug');
def message = "BUILD ERROR: There was a problem building the Base Image. \n\n ${error_details}"
From bf7972dfe0b7a967676cb196bbf66655d799b940 Mon Sep 17 00:00:00 2001
From: John Gasper <jtgasper3@gmail.com>
Date: Wed, 2 May 2018 13:16:45 -0700
Subject: [PATCH 008/176] Configuring Grouper to logout via the Shib SP
---
container_files/ui/classes/grouper-ui.properties | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 container_files/ui/classes/grouper-ui.properties
diff --git a/container_files/ui/classes/grouper-ui.properties b/container_files/ui/classes/grouper-ui.properties
new file mode 100644
index 00000000..80fbee1e
--- /dev/null
+++ b/container_files/ui/classes/grouper-ui.properties
@@ -0,0 +1,12 @@
+#
+# Grouper UI configuration
+# $Id: grouper.client.example.properties,v 1.24 2009-12-30 04:23:02 mchyzer Exp $
+#
+
+# The grouper-ui.properties uses Grouper Configuration Overlays (documented on wiki)
+# By default the configuration is read from grouper-ui.base.properties
+# (which should not be edited), and the grouper-ui.properties overlays
+# the base settings. See the grouper-ui.base.properties for the possible
+# settings that can be applied to the grouper-ui.properties
+
+grouperUi.logout.redirectToUrl=/Shibboleth.sso/Logout
\ No newline at end of file
From b4f86a52f380202ae00d21d17bd992d4e47e37b3 Mon Sep 17 00:00:00 2001
From: John Gasper <jgasper@unicon.net>
Date: Tue, 8 May 2018 09:42:59 -0700
Subject: [PATCH 009/176] 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 <jgasper@unicon.net>
Date: Tue, 8 May 2018 09:46:05 -0700
Subject: [PATCH 010/176] 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 <chubing@internet2.edu>
Date: Tue, 8 May 2018 10:42:07 -0700
Subject: [PATCH 011/176] 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 <chubing@internet2.edu>
Date: Tue, 8 May 2018 10:52:15 -0700
Subject: [PATCH 012/176] 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 27040f3cc1f8854435f2b5604a3cff4581e9861e Mon Sep 17 00:00:00 2001
From: John Gasper <jtgasper3@gmail.com>
Date: Fri, 11 May 2018 18:31:15 -0700
Subject: [PATCH 013/176] minor tweaks
---
Dockerfile | 2 ++
container_files/usr-local-bin/daemon | 4 ----
container_files/usr-local-bin/entrypoint.sh | 6 ++++++
container_files/usr-local-bin/gsh | 4 ----
container_files/usr-local-bin/library.sh | 0
container_files/usr-local-bin/ui | 2 --
container_files/usr-local-bin/ui-ws | 2 --
container_files/usr-local-bin/ws | 2 --
test-compose/data/Dockerfile | 4 ++--
9 files changed, 10 insertions(+), 16 deletions(-)
create mode 100755 container_files/usr-local-bin/entrypoint.sh
mode change 100644 => 100755 container_files/usr-local-bin/library.sh
diff --git a/Dockerfile b/Dockerfile
index 6723853c..36f208d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -130,4 +130,6 @@ WORKDIR /opt/grouper/grouper.apiBinary/
EXPOSE 80 443
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
CMD ["bin/gsh", "-loader"]
diff --git a/container_files/usr-local-bin/daemon b/container_files/usr-local-bin/daemon
index 27f3da63..60ebd468 100755
--- a/container_files/usr-local-bin/daemon
+++ b/container_files/usr-local-bin/daemon
@@ -1,9 +1,5 @@
#!/bin/bash
-. /usr/local/bin/library.sh
-
-prepDaemon
-
export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
exec bin/gsh -loader > /tmp/loggrouper
diff --git a/container_files/usr-local-bin/entrypoint.sh b/container_files/usr-local-bin/entrypoint.sh
new file mode 100755
index 00000000..bf4bfd69
--- /dev/null
+++ b/container_files/usr-local-bin/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. /usr/local/bin/library.sh
+prepDaemon
+
+exec "$@"
\ No newline at end of file
diff --git a/container_files/usr-local-bin/gsh b/container_files/usr-local-bin/gsh
index 0539b40a..589a1838 100755
--- a/container_files/usr-local-bin/gsh
+++ b/container_files/usr-local-bin/gsh
@@ -1,9 +1,5 @@
#!/bin/bash
-. /usr/local/bin/library.sh
-
-prepDaemon
-
export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
exec bin/gsh "$@" | tee /tmp/loggrouper
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
old mode 100644
new mode 100755
diff --git a/container_files/usr-local-bin/ui b/container_files/usr-local-bin/ui
index a03ed585..c8895168 100755
--- a/container_files/usr-local-bin/ui
+++ b/container_files/usr-local-bin/ui
@@ -1,7 +1,5 @@
#!/bin/bash
-. /usr/local/bin/library.sh
-
prepUI
export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
diff --git a/container_files/usr-local-bin/ui-ws b/container_files/usr-local-bin/ui-ws
index de1384c4..8defab26 100755
--- a/container_files/usr-local-bin/ui-ws
+++ b/container_files/usr-local-bin/ui-ws
@@ -1,7 +1,5 @@
#!/bin/bash
-. /usr/local/bin/library.sh
-
prepUI
prepWS
diff --git a/container_files/usr-local-bin/ws b/container_files/usr-local-bin/ws
index 0e10b688..51632529 100755
--- a/container_files/usr-local-bin/ws
+++ b/container_files/usr-local-bin/ws
@@ -1,7 +1,5 @@
#!/bin/bash
-. /usr/local/bin/library.sh
-
prepWS
exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomcat.conf
diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile
index 35317837..85b4e261 100644
--- a/test-compose/data/Dockerfile
+++ b/test-compose/data/Dockerfile
@@ -36,8 +36,8 @@ 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 \
- && ldapadd -H ldap:/// -f /seed-data/users.ldif -x -D "cn=Directory Manager" -w password
+ && 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 &) \
&& while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \
From 1df10e8aac240200e81a184cbf46b719b6e2c910 Mon Sep 17 00:00:00 2001
From: John Gasper <jgasper@unicon.net>
Date: Wed, 16 May 2018 08:24:47 -0700
Subject: [PATCH 014/176] 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 <jgasper@unicon.net>
Date: Wed, 16 May 2018 08:25:39 -0700
Subject: [PATCH 015/176] 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 <jgasper@unicon.net>
Date: Wed, 16 May 2018 08:34:37 -0700
Subject: [PATCH 016/176] 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 <chubing@internet2.edu>
Date: Wed, 16 May 2018 11:48:42 -0400
Subject: [PATCH 017/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 11:43:53 -0400
Subject: [PATCH 018/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 12:20:00 -0400
Subject: [PATCH 019/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 12:21:20 -0400
Subject: [PATCH 020/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 14:26:39 -0400
Subject: [PATCH 021/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 14:28:16 -0400
Subject: [PATCH 022/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 16:01:16 -0400
Subject: [PATCH 023/176] 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 <chubing@internet2.edu>
Date: Thu, 17 May 2018 16:16:22 -0400
Subject: [PATCH 024/176] 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 <chubing@internet2.edu>
Date: Fri, 18 May 2018 13:23:51 -0400
Subject: [PATCH 025/176] 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
From bbbda9d9dc145c78ffe4d4778eee07b448a4fb36 Mon Sep 17 00:00:00 2001
From: John Gasper <jtgasper3@gmail.com>
Date: Mon, 21 May 2018 11:52:41 -0700
Subject: [PATCH 026/176] re-working entrypoint/start-up scripts; fixed a few
other things along the way.
---
container_files/usr-local-bin/daemon | 4 +
container_files/usr-local-bin/entrypoint.sh | 2 +-
container_files/usr-local-bin/gsh | 4 +
container_files/usr-local-bin/library.sh | 91 ++++++++++++++-----
container_files/usr-local-bin/ui | 2 +
container_files/usr-local-bin/ui-ws | 2 +
container_files/usr-local-bin/ws | 2 +
test-compose/README.md | 2 +-
.../grouper/grouper.client.properties | 4 +-
test-compose/data/Dockerfile | 3 +-
test-compose/docker-compose.yml | 14 +--
11 files changed, 91 insertions(+), 39 deletions(-)
diff --git a/container_files/usr-local-bin/daemon b/container_files/usr-local-bin/daemon
index 60ebd468..27f3da63 100755
--- a/container_files/usr-local-bin/daemon
+++ b/container_files/usr-local-bin/daemon
@@ -1,5 +1,9 @@
#!/bin/bash
+. /usr/local/bin/library.sh
+
+prepDaemon
+
export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
exec bin/gsh -loader > /tmp/loggrouper
diff --git a/container_files/usr-local-bin/entrypoint.sh b/container_files/usr-local-bin/entrypoint.sh
index bf4bfd69..83e985d6 100755
--- a/container_files/usr-local-bin/entrypoint.sh
+++ b/container_files/usr-local-bin/entrypoint.sh
@@ -1,6 +1,6 @@
#!/bin/sh
. /usr/local/bin/library.sh
-prepDaemon
+prepConf
exec "$@"
\ No newline at end of file
diff --git a/container_files/usr-local-bin/gsh b/container_files/usr-local-bin/gsh
index 589a1838..0539b40a 100755
--- a/container_files/usr-local-bin/gsh
+++ b/container_files/usr-local-bin/gsh
@@ -1,5 +1,9 @@
#!/bin/bash
+. /usr/local/bin/library.sh
+
+prepDaemon
+
export GSH_JVMARGS="-DENV=$ENV -DUSERTOKEN=$USERTOKEN"
exec bin/gsh "$@" | tee /tmp/loggrouper
diff --git a/container_files/usr-local-bin/library.sh b/container_files/usr-local-bin/library.sh
index 15cf545c..5d3790af 100755
--- a/container_files/usr-local-bin/library.sh
+++ b/container_files/usr-local-bin/library.sh
@@ -7,26 +7,37 @@ setupPipe() {
mkfifo -m 666 $1
}
-# Make a "console" logging pipe that anyone can write too regardless of who owns the process.
-setupPipe /tmp/logpipe
-cat <> /tmp/logpipe &
+setupLoggingPipe() {
+ # Make a "console" logging pipe that anyone can write too regardless of who owns the process.
+ setupPipe /tmp/logpipe
+ cat <> /tmp/logpipe &
+}
# Make loggers pipes for the supervisord connected apps' console, so that we can prepend the streams.
-setupPipe /tmp/loggrouper
-(cat <> /tmp/loggrouper | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "grouper;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
-
-setupPipe /tmp/loghttpd
-(cat <> /tmp/loghttpd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "httpd;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+setupGrouperLogPipe() {
+ setupPipe /tmp/loggrouper
+ (cat <> /tmp/loggrouper | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "grouper;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+}
-setupPipe /tmp/logshibd
-(cat <> /tmp/logshibd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "shibd;console;%s;%s;%s", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+setupHttpdLogPipe() {
+ setupPipe /tmp/loghttpd
+ (cat <> /tmp/loghttpd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "httpd;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+}
-setupPipe /tmp/logtomcat
-(cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomcat;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+setupShibdLogPipe() {
+ setupPipe /tmp/logshibd
+ (cat <> /tmp/logshibd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "shibd;console;%s;%s;%s", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+}
-setupPipe /tmp/logsuperd
-(cat <> /tmp/logsuperd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "supervisord;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+setupTomcatLogPipe() {
+ setupPipe /tmp/logtomcat
+ (cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomcat;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+}
+setupSupervisordLogPipe() {
+ setupPipe /tmp/logsuperd
+ (cat <> /tmp/logsuperd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "supervisord;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' &>/tmp/logpipe) &
+}
linkGrouperSecrets() {
for filepath in /run/secrets/*; do
@@ -46,6 +57,11 @@ linkGrouperSecrets() {
}
prepDaemon() {
+ setupLoggingPipe
+ setupGrouperLogPipe
+}
+
+prepDaemonConf() {
local dest=/opt/grouper/grouper.apiBinary
linkGrouperSecrets $dest/conf
@@ -58,6 +74,16 @@ prepDaemon() {
}
prepSCIM() {
+ setupLoggingPipe
+ setupGrouperLogPipe
+ setupHttpdLogPipe
+ setupTomcatLogPipe
+
+
+ cp /opt/tier-support/grouper-ws-scim.xml /opt/tomee/conf/Catalina/localhost/
+}
+
+prepSCIMConf() {
local dest=/opt/grouper/grouper.scim/WEB-INF
linkGrouperSecrets $dest/classes
@@ -66,12 +92,21 @@ prepSCIM() {
fi
if [ -d "/opt/grouper/lib" ]; then
cp -r /opt/grouper/lib/* $dest/lib/
- fi
-
- cp /opt/tier-support/grouper-ws-scim.xml /opt/tomee/conf/Catalina/localhost/
+ fi
}
prepUI() {
+ setupLoggingPipe
+ setupGrouperLogPipe
+ setupHttpdLogPipe
+ setupShibdLogPipe
+ setupTomcatLogPipe
+ setupSupervisordLogPipe
+
+ cp /opt/tier-support/grouper.xml /opt/tomcat/conf/Catalina/localhost/
+}
+
+prepUIConf() {
local dest=/opt/grouper/grouper.ui/WEB-INF
linkGrouperSecrets $dest/classes
@@ -81,11 +116,19 @@ prepUI() {
if [ -d "/opt/grouper/lib" ]; then
cp -r /opt/grouper/lib/* $dest/lib/
fi
-
- cp /opt/tier-support/grouper.xml /opt/tomcat/conf/Catalina/localhost/
}
prepWS() {
+ setupLoggingPipe
+ setupGrouperLogPipe
+ setupHttpdLogPipe
+ setupTomcatLogPipe
+ setupSupervisordLogPipe
+
+ cp /opt/tier-support/grouper-ws.xml /opt/tomcat/conf/Catalina/localhost/
+}
+
+prepWSConf() {
local dest=/opt/grouper/grouper.ws/WEB-INF
linkGrouperSecrets $dest/classes
@@ -95,6 +138,12 @@ prepWS() {
if [ -d "/opt/grouper/lib" ]; then
cp -r /opt/grouper/lib/* $dest/lib/
fi
-
- cp /opt/tier-support/grouper-ws.xml /opt/tomcat/conf/Catalina/localhost/
}
+
+
+prepConf() {
+ prepDaemonConf
+ prepSCIMConf
+ prepUIConf
+ prepWSConf
+}
\ No newline at end of file
diff --git a/container_files/usr-local-bin/ui b/container_files/usr-local-bin/ui
index c8895168..a03ed585 100755
--- a/container_files/usr-local-bin/ui
+++ b/container_files/usr-local-bin/ui
@@ -1,5 +1,7 @@
#!/bin/bash
+. /usr/local/bin/library.sh
+
prepUI
export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
diff --git a/container_files/usr-local-bin/ui-ws b/container_files/usr-local-bin/ui-ws
index 8defab26..de1384c4 100755
--- a/container_files/usr-local-bin/ui-ws
+++ b/container_files/usr-local-bin/ui-ws
@@ -1,5 +1,7 @@
#!/bin/bash
+. /usr/local/bin/library.sh
+
prepUI
prepWS
diff --git a/container_files/usr-local-bin/ws b/container_files/usr-local-bin/ws
index 51632529..0e10b688 100755
--- a/container_files/usr-local-bin/ws
+++ b/container_files/usr-local-bin/ws
@@ -1,5 +1,7 @@
#!/bin/bash
+. /usr/local/bin/library.sh
+
prepWS
exec /usr/bin/supervisord -c /opt/tier-support/supervisord-tomcat.conf
diff --git a/test-compose/README.md b/test-compose/README.md
index 2dc53e0e..6bf62c51 100644
--- a/test-compose/README.md
+++ b/test-compose/README.md
@@ -53,7 +53,7 @@ Note that when accessing the Grouper UI, Grouper WS, or Shibboleth IdP, your bro
- In this example, we use a variety of ways to pass in passwords (Grouper database, LDAP, Grouper Client, and RabbitMQ). The point is to demonstrate possibilities and not demonstrating what is required. (See the image readme for more details.)
- Docker `configs` are not supported by Docker Compose (when run in a non-Swarm mode), so those are represented in the `docker-compose.yml` file as bind mount volumes.
- The Grouper config files in the `data` image's `conf` directory are used to build the sample grouper database and ldap store. They are not used when the container is instantiated as there is no Grouper runtime in this container.
-- The containers will use Docker Secrets and bind mounts for non-sensitive files that are read from the `configs-ans-secrets` directory in the `test-compose` directory.
+- The containers will use Docker Secrets and bind mounts for non-sensitive files that are read from the `configs-and-secrets` directory in the `test-compose` directory.
- With regard to RabbitMQ, the deployer must manually add a queue named `sampleQueue` to see Grouper messages in RabbitMQ. Messages will be dropped by RabbitMQ (and the Grouper Deamon will log errors) until this occurs.
- In this example, we don't care about the IdP secrets. They are baked into the overlay instead of using Docker Secrets. (This is not best practice for an IdP configuration, but that isn't the focus of this example.)
diff --git a/test-compose/configs-and-secrets/grouper/grouper.client.properties b/test-compose/configs-and-secrets/grouper/grouper.client.properties
index 5169c718..dcc50ae7 100644
--- a/test-compose/configs-and-secrets/grouper/grouper.client.properties
+++ b/test-compose/configs-and-secrets/grouper/grouper.client.properties
@@ -55,7 +55,7 @@ grouperClient.webService.login = banderson
# password for shared secret authentication to web service
# or you can put a filename with an encrypted password
-grouperClient.webService.password = ${java.lang.System.getenv().get('GROUPER_CLIENT_WEBSERVICE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('GROUPER_CLIENT_WEBSERVICE_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('GROUPER_CLIENT_WEBSERVICE_PASSWORD') }
+grouperClient.webService.password.elConfig = ${java.lang.System.getenv().get('GROUPER_CLIENT_WEBSERVICE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('GROUPER_CLIENT_WEBSERVICE_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('GROUPER_CLIENT_WEBSERVICE_PASSWORD') }
################################
@@ -100,7 +100,7 @@ grouper.messaging.system.rabbitmq.defaultSystemName = rabbitmqSystem
grouper.messaging.system.rabbitmq.user = guest
#pass
-grouper.messaging.system.rabbitmq.password = ${java.lang.System.getenv().get('RABBITMQ_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('RABBITMQ_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('RABBITMQ_PASSWORD') }
+grouper.messaging.system.rabbitmq.password.elConfig = ${java.lang.System.getenv().get('RABBITMQ_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('RABBITMQ_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('RABBITMQ_PASSWORD') }
# set the following three properties if you want to use TLS connection to rabbitmq. All three need to be populated.
# TLS Version
#grouper.messaging.system.rabbitmqSystem.tlsVersion = TLSv1.1
diff --git a/test-compose/data/Dockerfile b/test-compose/data/Dockerfile
index 85b4e261..cbb3ca2d 100644
--- a/test-compose/data/Dockerfile
+++ b/test-compose/data/Dockerfile
@@ -8,7 +8,8 @@ COPY container_files/conf/ /opt/grouper/grouper.apiBinary/conf/
RUN yum install -y epel-release \
&& yum update -y \
&& yum install -y 389-ds-base 389-admin 389-adminutil mariadb-server mariadb \
- && yum clean all
+ && yum clean all \
+ && rm -rf /var/cache/yum
RUN mysql_install_db \
&& chown -R mysql:mysql /var/lib/mysql/ \
diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index b4547273..79c4bf26 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:
@@ -13,9 +13,6 @@ services:
- RABBITMQ_PASSWORD_FILE=/run/secrets/rabbitmq_password.txt
- SUBJECT_SOURCE_LDAP_PASSWORD=password
- USERTOKEN=build-2
- logging:
- options:
- tag: "grouper daemon"
networks:
- back
secrets:
@@ -46,9 +43,6 @@ services:
- GROUPER_DATABASE_PASSWORD_FILE=/run/secrets/database_password.txt
- SUBJECT_SOURCE_LDAP_PASSWORD=password
- USERTOKEN=build-2
- logging:
- options:
- tag: "grouper ui"
networks:
- front
- back
@@ -100,9 +94,6 @@ services:
- GROUPER_DATABASE_PASSWORD_FILE=/run/secrets/database_password.txt
- SUBJECT_SOURCE_LDAP_PASSWORD=password
- USERTOKEN=build-2
- logging:
- options:
- tag: "grouoer ws"
networks:
- front
- back
@@ -178,9 +169,6 @@ services:
- GROUPER_DATABASE_PASSWORD_FILE=/run/secrets/database_password.txt
- SUBJECT_SOURCE_LDAP_PASSWORD=password
- USERTOKEN=build-2
- logging:
- options:
- tag: "grouper gsh"
networks:
- back
secrets:
From 6da580cffc195ddeb1423df30ae4f08337293d55 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 24 May 2018 11:17:46 -0400
Subject: [PATCH 027/176] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index dc613c9e..f4b7f19d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/)
+
# Supported tags
From b680ca8b225795ebc46f0616d66f1474f7545c1f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 24 May 2018 11:26:18 -0400
Subject: [PATCH 028/176] Update README.md
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index f4b7f19d..8c909fe5 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ While TIER recommends/supports using Docker Swarm for orchestrating the Grouper
### Daemon/Loader
-Run the Grouper Daemon/Loader as a service.
+Run the Grouper Daemon/Loader as a service. If the daemon/loader container dies unexpectedly, it may be due to memory contraints. Refer to the "Grouper Shell/Loader" section below for information on how to tweak memory settings. The default
```console
$ docker service create --detach --name grouper-daemon tier/grouper:latest daemon
@@ -208,8 +208,8 @@ Deployers can set runtime variables to both the Grouper Shell and Loader/Daemon
### Grouper Shell/Loader
The following environment variables are used by the Grouper Shell/Loader:
-- MEM_START: corresponds to the java's `-Xms`.
-- MEM_MAX: corresponds to java's `-Xmx`.
+- MEM_START: corresponds to the java's `-Xms`. (default is 64m)
+- MEM_MAX: corresponds to java's `-Xmx`. (default is 750m)
### Tomcat/TomEE
From 47209d316e882e6e5de20959524d2aef975a1536 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 24 May 2018 11:27:07 -0400
Subject: [PATCH 029/176] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8c909fe5..fb7a474b 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ While TIER recommends/supports using Docker Swarm for orchestrating the Grouper
### Daemon/Loader
-Run the Grouper Daemon/Loader as a service. If the daemon/loader container dies unexpectedly, it may be due to memory contraints. Refer to the "Grouper Shell/Loader" section below for information on how to tweak memory settings. The default
+Run the Grouper Daemon/Loader as a service. If the daemon/loader container dies unexpectedly, it may be due to memory contraints. Refer to the "Grouper Shell/Loader" section below for information on how to tweak memory settings.
```console
$ docker service create --detach --name grouper-daemon tier/grouper:latest daemon
From 8f4d014f6fa7b6ea5bfd3678904fe9c0108a6a2e Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 4 Jun 2018 16:15:29 -0400
Subject: [PATCH 030/176] bump zulu to 8u172
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 36f208d8..dc0dba78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ RUN yum update -y \
ENV GROUPER_VERSION=2.3.0 \
JAVA_HOME=/opt/java
-RUN java_version=8.0.131; \
- zulu_version=8.21.0.1; \
+RUN java_version=8.0.172; \
+ zulu_version=8.30.0.1; \
echo 'Downloading the OpenJDK Zulu...' \
&& wget -q http://cdn.azul.com/zulu/bin/zulu$zulu_version-jdk$java_version-linux_x64.tar.gz \
&& echo "1931ed3beedee0b16fb7fd37e069b162 zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
From d262cdbd3168d9502bbb72f732397c9e3e8d4411 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 4 Jun 2018 16:20:09 -0400
Subject: [PATCH 031/176] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index dc0dba78..554abba8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN java_version=8.0.172; \
zulu_version=8.30.0.1; \
echo 'Downloading the OpenJDK Zulu...' \
&& wget -q http://cdn.azul.com/zulu/bin/zulu$zulu_version-jdk$java_version-linux_x64.tar.gz \
- && echo "1931ed3beedee0b16fb7fd37e069b162 zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
+ && echo "0a101a592a177c1c7bc63738d7bc2930 zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
&& tar -zxvf zulu$zulu_version-jdk$java_version-linux_x64.tar.gz -C /opt \
&& ln -s /opt/zulu$zulu_version-jdk$java_version-linux_x64 $JAVA_HOME
From 7f1342978e58a986bb97bbb7ba91cfa7c195f4b4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 4 Jun 2018 20:33:30 -0400
Subject: [PATCH 032/176] Update grouper.installer.properties
---
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 ef3e7b55..9b2d9c34 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -29,7 +29,7 @@ grouperInstaller.autorun.deleteAndInitDatabase = t
grouperInstaller.autorun.addQuickstartData = f
grouperInstaller.autorun.installClient = f
-grouperInstaller.autorun.installGrouperActiveMqMessaging = t
+grouperInstaller.autorun.installGrouperActiveMqMessaging = f
grouperInstaller.autorun.activeMqWhereInstalled = /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/
grouperInstaller.autorun.installGrouperAwsSqsMessaging = t
From 1deb71235b51a73fb1d9547f6427f4d187117cb0 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 14 Jun 2018 11:38:22 -0400
Subject: [PATCH 033/176] change Zulu Java to CentOS-packaged Zulu
---
Dockerfile | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 554abba8..bdc6c589 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,15 +5,20 @@ RUN yum update -y \
&& yum clean all
ENV GROUPER_VERSION=2.3.0 \
- JAVA_HOME=/opt/java
+ JAVA_HOME=/usr
-RUN java_version=8.0.172; \
- zulu_version=8.30.0.1; \
- echo 'Downloading the OpenJDK Zulu...' \
- && wget -q http://cdn.azul.com/zulu/bin/zulu$zulu_version-jdk$java_version-linux_x64.tar.gz \
- && echo "0a101a592a177c1c7bc63738d7bc2930 zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
- && tar -zxvf zulu$zulu_version-jdk$java_version-linux_x64.tar.gz -C /opt \
- && ln -s /opt/zulu$zulu_version-jdk$java_version-linux_x64 $JAVA_HOME
+# use Zulu package
+RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
+ && curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
+ && yum -y install zulu-8
+
+#RUN java_version=8.0.172; \
+# zulu_version=8.30.0.1; \
+# echo 'Downloading the OpenJDK Zulu...' \
+# && wget -q http://cdn.azul.com/zulu/bin/zulu$zulu_version-jdk$java_version-linux_x64.tar.gz \
+# && echo "0a101a592a177c1c7bc63738d7bc2930 zulu$zulu_version-jdk$java_version-linux_x64.tar.gz" | md5sum -c - \
+# && tar -zxvf zulu$zulu_version-jdk$java_version-linux_x64.tar.gz -C /opt \
+# && ln -s /opt/zulu$zulu_version-jdk$java_version-linux_x64 $JAVA_HOME
#RUN java_version=8u151; \
# java_bnumber=12; \
@@ -88,7 +93,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
ImageName=$imagename \
ImageOS=centos7
-ENV JAVA_HOME=/opt/java \
+ENV JAVA_HOME=/usr \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouper.apiBinary
From 87038f387bdd3e67da185886c2df8944c99f0fe0 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 14 Jun 2018 18:10:00 -0500
Subject: [PATCH 034/176] update README
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index fb7a474b..c00d0dd8 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,7 @@ Here is a list of significant directories and files that deployers should be awa
- `/opt/tomcat/`: used to run Grouper UI and Grouper WS
- `/opt/tomee/`: used to run the Grouper SCIM Server.
- `/var/run/secrets`: location where Docker Secrets are mounted into the container. Secrets starting with `grouper_`, `shib_`, and `httpd_` have special meaning. See `Secrets/Configs` above.
+- `/usr/lib/jvm/zulu-8/jre/lib/security/cacerts`: location of the Java trust store.
To examine baseline image files, one might run `docker run --name=temp -it tier/grouper bash` and browse through these file system endpoints. While the container is running one may copy files out of the image/container using something like `docker cp containerId:/opt/grouper/grouper.api/conf/grouper.properties .`, which will copy the `grouper.properties` to the Docker client's present working directory. These files can then be edited and applied via the mechanisms outlined above.
From 47a78326c44832c329e7b8e24968395e3bada532 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:02:36 -0400
Subject: [PATCH 035/176] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index bdc6c589..1e052d72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN yum update -y \
&& yum clean all
ENV GROUPER_VERSION=2.3.0 \
- JAVA_HOME=/usr
+ JAVA_HOME=/usr/lib/jvm/zulu-8/
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
From 61a3ba6a0d2a4a8abb2afac430cc09713b759205 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:24:11 -0400
Subject: [PATCH 036/176] Update Dockerfile
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 1e052d72..8720987f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV GROUPER_VERSION=2.3.0 \
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
&& yum -y install zulu-8
+ && ln -s $JAVA_HOME/bin/java /etc/alternatives
#RUN java_version=8.0.172; \
# zulu_version=8.30.0.1; \
From 30df43bdb904c1c879ceb5cdd976fea5dd154ff2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:24:58 -0400
Subject: [PATCH 037/176] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8720987f..41c9cce2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ ENV GROUPER_VERSION=2.3.0 \
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
- && yum -y install zulu-8
+ && yum -y install zulu-8 \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives
#RUN java_version=8.0.172; \
From b03d1cdda13aab81773bfe9a52343ae471a3effe Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:28:36 -0400
Subject: [PATCH 038/176] Update Dockerfile
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 41c9cce2..bc6512b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ ENV GROUPER_VERSION=2.3.0 \
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
&& yum -y install zulu-8 \
+ && ls -ld /etc/alternatives/java \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives
#RUN java_version=8.0.172; \
From a14c250bb2fdcacf49581b7feb2ced5fa971c0be Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 16:31:29 -0400
Subject: [PATCH 039/176] Update Dockerfile
---
Dockerfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index bc6512b0..0070aedc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,7 @@ ENV GROUPER_VERSION=2.3.0 \
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
&& curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo \
- && yum -y install zulu-8 \
- && ls -ld /etc/alternatives/java \
- && ln -s $JAVA_HOME/bin/java /etc/alternatives
+ && yum -y install zulu-8
#RUN java_version=8.0.172; \
# zulu_version=8.30.0.1; \
@@ -60,6 +58,7 @@ COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.ws-$GROUPER_VERSION
#COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouper.clientBinary-$GROUPER_VERSION/ /opt/grouper/grouper.clientBinary/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomcat-$TOMCAT_VERSION/ /opt/tomcat/
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomee-webprofile-$TOMEE_VERSION/ /opt/tomee/
+COPY --from=installing /etc/alternatives/java /etc/alternatives/java
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
From c200a08c8f35df4b146a7dcbffc4bd8293af73b6 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 17:37:55 -0400
Subject: [PATCH 040/176] Update Dockerfile
---
Dockerfile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 0070aedc..4e13f4f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,7 +94,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
ImageName=$imagename \
ImageOS=centos7
-ENV JAVA_HOME=/usr \
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouper.apiBinary
@@ -115,7 +115,9 @@ RUN groupadd -r tomcat \
&& useradd -r -m -s /sbin/nologin -g tomcat tomcat \
&& mkdir -p /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
- && chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/
+ && chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
+ && rm /etc/alternatives/java \
+ && ln -s $JAVA_HOME/bin/java /etc/alternatives/java
RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
From 64d77c1bdee8fcdbdb0f1d3d1175acd4b6c5a226 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 15 Jun 2018 18:36:54 -0400
Subject: [PATCH 041/176] Update Dockerfile
---
Dockerfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 4e13f4f2..ac08e98b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -116,7 +116,6 @@ RUN groupadd -r tomcat \
&& mkdir -p /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomcat/logs/ /opt/tomcat/temp/ /opt/tomcat/work/ \
&& chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
- && rm /etc/alternatives/java \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java
RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
From 0565665f97eb1f8a5124a7c70500a6472a78a031 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 27 Jun 2018 13:35:39 -0400
Subject: [PATCH 042/176] Create native.logger
---
container_files/shibboleth/native.logger | 39 ++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 container_files/shibboleth/native.logger
diff --git a/container_files/shibboleth/native.logger b/container_files/shibboleth/native.logger
new file mode 100644
index 00000000..0b01f32f
--- /dev/null
+++ b/container_files/shibboleth/native.logger
@@ -0,0 +1,39 @@
+# set overall behavior
+log4j.rootCategory=INFO, native_log, warn_log
+
+# fairly verbose for DEBUG, so generally leave at INFO
+log4j.category.XMLTooling.XMLObject=INFO
+log4j.category.XMLTooling.KeyInfoResolver=INFO
+log4j.category.Shibboleth.IPRange=INFO
+log4j.category.Shibboleth.PropertySet=INFO
+
+# raise for low-level tracing of SOAP client HTTP/SSL behavior
+log4j.category.XMLTooling.libcurl=INFO
+
+# useful categories to tune independently:
+#
+# tracing of SAML messages and security policies
+#log4j.category.OpenSAML.MessageDecoder=DEBUG
+#log4j.category.OpenSAML.MessageEncoder=DEBUG
+#log4j.category.OpenSAML.SecurityPolicyRule=DEBUG
+# interprocess message remoting
+#log4j.category.Shibboleth.Listener=DEBUG
+# mapping of requests to applicationId
+#log4j.category.Shibboleth.RequestMapper=DEBUG
+# high level session cache operations
+#log4j.category.Shibboleth.SessionCache=DEBUG
+# persistent storage and caching
+#log4j.category.XMLTooling.StorageService=DEBUG
+
+# define the appender
+
+log4j.appender.native_log=org.apache.log4j.FileAppender
+log4j.appender.native_log.fileName=/tmp/logpipe
+log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
+log4j.appender.native_log.layout.ConversionPattern=shibd;native.log;${ENV};${USERTOKEN};%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
+
+log4j.appender.warn_log=org.apache.log4j.FileAppender
+log4j.appender.warn_log.fileName=/tmp/logpipe
+log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
+log4j.appender.warn_log.layout.ConversionPattern=shibd;native_warn.log;${ENV};${USERTOKEN};%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
+log4j.appender.warn_log.threshold=WARN
From 961a8effd934a6c5da119af505728ee0378e3274 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 13 Jul 2018 14:56:25 -0400
Subject: [PATCH 043/176] Update grouper.installer.properties
---
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 9b2d9c34..b9da7f2a 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_106,grouper_v2_3_0_ui_patch_43,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_107,grouper_v2_3_0_ui_patch_44,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 a35a1b58419c598d1cc9d0d2ad2c6e764cc89a42 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 17 Jul 2018 16:48:46 -0400
Subject: [PATCH 044/176] Update grouper.installer.properties
---
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 b9da7f2a..284e5dca 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_107,grouper_v2_3_0_ui_patch_44,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,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 13421ac4b4469859586775fccd5165ca9c92f968 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 11:49:12 -0400
Subject: [PATCH 045/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 284e5dca..9ac32f07 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -14,9 +14,9 @@ grouperInstaller.default.installOrUpgrade = install
##
##############################
-grouperInstaller.autorun.installAllPatches = false
-grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+grouperInstaller.autorun.installAllPatches = true
+# grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
+# grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,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 9c931a0c83c39b95e0c751b8e315fe38fea65795 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 11:50:54 -0400
Subject: [PATCH 046/176] Update grouper.installer.properties
---
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 9ac32f07..7f0e354d 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -1,7 +1,7 @@
# this should be before the version number
download.server.url = https://software.internet2.edu/grouper
# default version to install
-grouper.version = 2.3.0
+grouper.version = 2.4.0
# print out autorun keys in prompts so you can easily see how to configure the autorun
grouperInstaller.print.autorunKeys = true
# default to install or upgrade (default is install)
From 8dc34ffb3578683f0e73e7297823ff1c3b0aea01 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 11:53:23 -0400
Subject: [PATCH 047/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 7f0e354d..35cab020 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -30,10 +30,10 @@ grouperInstaller.autorun.addQuickstartData = f
grouperInstaller.autorun.installClient = f
grouperInstaller.autorun.installGrouperActiveMqMessaging = f
-grouperInstaller.autorun.activeMqWhereInstalled = /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/
+grouperInstaller.autorun.activeMqWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
grouperInstaller.autorun.installGrouperAwsSqsMessaging = t
-grouperInstaller.autorun.AwsSqsWhereInstalled = /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/
+grouperInstaller.autorun.AwsSqsWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
grouperInstaller.autorun.installGrouperRabbitMqMessaging = t
-grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.3.0/grouper.apiBinary-2.3.0/
+grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
From 369cf6cac3b93b677b0ed28c58fa608b63b555bc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 11:54:09 -0400
Subject: [PATCH 048/176] Update Dockerfile
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ac08e98b..f600f750 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ RUN yum update -y \
&& yum install -y wget tar unzip dos2unix \
&& yum clean all
-ENV GROUPER_VERSION=2.3.0 \
+ENV GROUPER_VERSION=2.4.0 \
JAVA_HOME=/usr/lib/jvm/zulu-8/
# use Zulu package
@@ -46,7 +46,7 @@ RUN echo 'Installing Grouper'; \
FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.3.0 \
+ENV GROUPER_VERSION=2.4.0 \
TOMCAT_VERSION=8.5.12 \
TOMEE_VERSION=7.0.0
From 5f638ebabe52dee5a0f00fb95437f316fdc3dde5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 12:36:30 -0400
Subject: [PATCH 049/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 3 +++
1 file changed, 3 insertions(+)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 35cab020..ef3aca3d 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -37,3 +37,6 @@ grouperInstaller.autorun.AwsSqsWhereInstalled = /opt/grouper/2.4.0/grouper.apiBi
grouperInstaller.autorun.installGrouperRabbitMqMessaging = t
grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
+
+# disable installing pspng, for now
+grouperInstaller.autorun.installPspng = f
From 63af7e075c8af8ea55242fac93289e4d3eebfbc4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 12:43:03 -0400
Subject: [PATCH 050/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ef3aca3d..8537cf91 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -40,3 +40,4 @@ grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.api
# disable installing pspng, for now
grouperInstaller.autorun.installPspng = f
+grouperInstaller.autorun.installPsp = f
From 31f29bc689a7859fbb40e3ba4f944b2cce4343f5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 12:57:07 -0400
Subject: [PATCH 051/176] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index f600f750..be3b3c21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -118,7 +118,7 @@ RUN groupadd -r tomcat \
&& chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java
-RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
+# RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
COPY container_files/tier-support/ /opt/tier-support/
COPY container_files/usr-local-bin/ /usr/local/bin/
From 46679ff5a1f6e42f5661ed55bb639779dabea725 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 13:41:19 -0400
Subject: [PATCH 052/176] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index be3b3c21..f600f750 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -118,7 +118,7 @@ RUN groupadd -r tomcat \
&& chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java
-# RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
+RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
COPY container_files/tier-support/ /opt/tier-support/
COPY container_files/usr-local-bin/ /usr/local/bin/
From fed93af0532a5b45728499d5252e3e2a0b11512e Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sat, 18 Aug 2018 14:18:45 -0400
Subject: [PATCH 053/176] Update Dockerfile
---
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index f600f750..eee6c126 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -118,7 +118,8 @@ RUN groupadd -r tomcat \
&& chown -R tomcat:tomcat /opt/tomee/logs/ /opt/tomee/temp/ /opt/tomee/work/ \
&& ln -s $JAVA_HOME/bin/java /etc/alternatives/java
-RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
+# does shib sp3 not generate these files?
+# RUN rm /etc/shibboleth/sp-key.pem /etc/shibboleth/sp-cert.pem
COPY container_files/tier-support/ /opt/tier-support/
COPY container_files/usr-local-bin/ /usr/local/bin/
From effd79f8ce0a62d9da592d6ba92631d8ad295099 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 28 Aug 2018 14:58:18 -0400
Subject: [PATCH 054/176] Update grouper.installer.properties
---
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 8537cf91..be9cd2b0 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -39,5 +39,5 @@ grouperInstaller.autorun.installGrouperRabbitMqMessaging = t
grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.apiBinary-2.4.0/
# disable installing pspng, for now
-grouperInstaller.autorun.installPspng = f
+grouperInstaller.autorun.installPspng = t
grouperInstaller.autorun.installPsp = f
From 218db1712a311cbbedb823c247d451e35d85cc60 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 29 Aug 2018 11:20:44 -0400
Subject: [PATCH 055/176] Update grouper.installer.properties
---
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 be9cd2b0..33c3edf6 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -40,4 +40,4 @@ grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.api
# disable installing pspng, for now
grouperInstaller.autorun.installPspng = t
-grouperInstaller.autorun.installPsp = f
+grouperInstaller.autorun.installPsp = t
From 034f4cbdfde169d0ad87fe03a8dc716df45e0a17 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 31 Aug 2018 10:07:12 -0400
Subject: [PATCH 056/176] Update grouper.installer.properties
---
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 33c3edf6..be9cd2b0 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -40,4 +40,4 @@ grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.api
# disable installing pspng, for now
grouperInstaller.autorun.installPspng = t
-grouperInstaller.autorun.installPsp = t
+grouperInstaller.autorun.installPsp = f
From c27e192d0731fcd9d880c8abde729f4f88295472 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 4 Sep 2018 10:11:28 -0400
Subject: [PATCH 057/176] Update grouper.installer.properties
---
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 284e5dca..5e5778d8 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_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
#### 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 059b9a93d0ab827b4985423316f66ec691fc5eff Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Tue, 4 Sep 2018 18:52:57 -0400
Subject: [PATCH 058/176] config changes for 2.4
---
container_files/grouper.installer.properties | 2 +-
.../grouper/grouper-loader.properties | 7 ++---
.../grouper/subject.properties | 26 ++++++++++++-------
.../container_files/conf/subject.properties | 26 ++++++++++++-------
.../container_files/seed-data/bootstrap.gsh | 7 +++++
5 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 33c3edf6..be9cd2b0 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -40,4 +40,4 @@ grouperInstaller.autorun.rabbitMqWhereInstalled = /opt/grouper/2.4.0/grouper.api
# disable installing pspng, for now
grouperInstaller.autorun.installPspng = t
-grouperInstaller.autorun.installPsp = t
+grouperInstaller.autorun.installPsp = f
diff --git a/test-compose/configs-and-secrets/grouper/grouper-loader.properties b/test-compose/configs-and-secrets/grouper/grouper-loader.properties
index 07c4f56a..c406f91a 100644
--- a/test-compose/configs-and-secrets/grouper/grouper-loader.properties
+++ b/test-compose/configs-and-secrets/grouper/grouper-loader.properties
@@ -4,17 +4,18 @@
# specify the ldap connection with user, pass, url
# the string after "ldap." is the ID of the connection, and it should not have
# spaces or other special chars in it. In this case is it "personLdap"
-
+
#note the URL should start with ldap: or ldaps: if it is SSL.
#It should contain the server and port (optional if not default), and baseDn,
#e.g. ldaps://ldapserver.school.edu:636/dc=school,dc=edu
-ldap.demo.url = ldap://data:389/dc=example,dc=edu
+ldap.demo.url = ldap://data:389/dc=internet2,dc=edu
#optional, if authenticated
ldap.demo.user = cn=admin,dc=internet2,dc=edu
#optional, if authenticated note the password can be stored encrypted in an external file
-ldap.demo.pass = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+#ldap.demo.pass = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+ldap.demo.pass = password
#optional, if you are using tls, set this to true. Generally you will not be using an SSL URL to use TLS...
ldap.demo.tls = false
diff --git a/test-compose/configs-and-secrets/grouper/subject.properties b/test-compose/configs-and-secrets/grouper/subject.properties
index fd5b25cd..c9329fdb 100644
--- a/test-compose/configs-and-secrets/grouper/subject.properties
+++ b/test-compose/configs-and-secrets/grouper/subject.properties
@@ -1,19 +1,25 @@
-subject.sources.xml.location =
+#subject.sources.xml.location =
+
+subjectApi.source.ldap.param.ldapServerId.value = demo
+
subjectApi.source.ldap.id = ldap
subjectApi.source.ldap.name = EDU Ldap
subjectApi.source.ldap.types = person
subjectApi.source.ldap.adapterClass = edu.internet2.middleware.grouper.subj.GrouperJndiSourceAdapter
-subjectApi.source.ldap.param.INITIAL_CONTEXT_FACTORY.value = com.sun.jndi.ldap.LdapCtxFactory
-subjectApi.source.ldap.param.PROVIDER_URL.value = ldap://data:389
-subjectApi.source.ldap.param.SECURITY_AUTHENTICATION.value = simple
-subjectApi.source.ldap.param.SECURITY_PRINCIPAL.value = cn=admin,dc=internet2,dc=edu
-subjectApi.source.ldap.param.SECURITY_CREDENTIALS.value.elConfig = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+
+## replaced with new LDAPTIVE lib
+#subjectApi.source.ldap.param.INITIAL_CONTEXT_FACTORY.value = com.sun.jndi.ldap.LdapCtxFactory
+#subjectApi.source.ldap.param.PROVIDER_URL.value = ldap://data:389
+#subjectApi.source.ldap.param.SECURITY_AUTHENTICATION.value = simple
+#subjectApi.source.ldap.param.SECURITY_PRINCIPAL.value = cn=admin,dc=internet2,dc=edu
+#subjectApi.source.ldap.param.SECURITY_CREDENTIALS.value.elConfig = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+#subjectApi.source.ldap.param.VTLDAP_VALIDATOR.value = ConnectLdapValidator
+
subjectApi.source.ldap.param.SubjectID_AttributeType.value = uid
subjectApi.source.ldap.param.SubjectID_formatToLowerCase.value = false
subjectApi.source.ldap.param.Name_AttributeType.value = cn
subjectApi.source.ldap.param.Description_AttributeType.value = cn
-subjectApi.source.ldap.param.VTLDAP_VALIDATOR.value = ConnectLdapValidator
subjectApi.source.ldap.param.subjectVirtualAttribute_0_searchAttribute0.value = ${subjectUtils.defaultIfBlank(subject.getAttributeValueOrCommaSeparated('uid'), "")},${subjectUtils.defaultIfBlank(subject.getAttributeValueOrCommaSeparated('cn'), "")},${subjectUtils.defaultIfBlank(subject.getAttributeValueOrCommaSeparated('exampleEduRegId'), "")}
subjectApi.source.ldap.param.sortAttribute0.value = cn
subjectApi.source.ldap.param.searchAttribute0.value = searchAttribute0
@@ -55,7 +61,7 @@ subjectApi.source.ldap.param.searchAttribute0.value = searchAttribute0
# Each subject has one and only on ID. Returns one result when searching for one ID.
subjectApi.source.ldap.search.searchSubject.param.filter.value = (&(uid=%TERM%)(objectclass=person))
subjectApi.source.ldap.search.searchSubject.param.scope.value = SUBTREE_SCOPE
-subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people,dc=internet2,dc=edu
+subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people
#searchSubjectByIdentifier: find a subject by identifier. Identifier is anything that uniquely
# identifies the user, e.g. jsmith or jsmith@institution.edu.
@@ -63,13 +69,13 @@ subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people,dc=inte
# even across sources. Returns one result when searching for one identifier.
subjectApi.source.ldap.search.searchSubjectByIdentifier.param.filter.value = (&(|(uid=%TERM%)(employeeNumber=%TERM%))(objectclass=person))
subjectApi.source.ldap.search.searchSubjectByIdentifier.param.scope.value = SUBTREE_SCOPE
-subjectApi.source.ldap.search.searchSubjectByIdentifier.param.base.value = ou=people,dc=internet2,dc=edu
+subjectApi.source.ldap.search.searchSubjectByIdentifier.param.base.value = ou=people
# search: find subjects by free form search. Returns multiple results.
subjectApi.source.ldap.search.search.param.filter.value = (&(|(|(uid=%TERM%)(cn=*%TERM%*))(uid=%TERM%*))(objectclass=person))
subjectApi.source.ldap.search.search.param.scope.value = SUBTREE_SCOPE
-subjectApi.source.ldap.search.search.param.base.value = ou=people,dc=internet2,dc=edu
+subjectApi.source.ldap.search.search.param.base.value = ou=people
subjectApi.source.ldap.attributes = givenName, sn, uid, mail, employeeNumber
subjectApi.source.ldap.internalAttributes = searchAttribute0
diff --git a/test-compose/data/container_files/conf/subject.properties b/test-compose/data/container_files/conf/subject.properties
index a8231911..c9329fdb 100644
--- a/test-compose/data/container_files/conf/subject.properties
+++ b/test-compose/data/container_files/conf/subject.properties
@@ -1,19 +1,25 @@
-subject.sources.xml.location =
+#subject.sources.xml.location =
+
+subjectApi.source.ldap.param.ldapServerId.value = demo
+
subjectApi.source.ldap.id = ldap
subjectApi.source.ldap.name = EDU Ldap
subjectApi.source.ldap.types = person
subjectApi.source.ldap.adapterClass = edu.internet2.middleware.grouper.subj.GrouperJndiSourceAdapter
-subjectApi.source.ldap.param.INITIAL_CONTEXT_FACTORY.value = com.sun.jndi.ldap.LdapCtxFactory
-subjectApi.source.ldap.param.PROVIDER_URL.value = ldap://localhost:389
-subjectApi.source.ldap.param.SECURITY_AUTHENTICATION.value = simple
-subjectApi.source.ldap.param.SECURITY_PRINCIPAL.value = cn=admin,dc=internet2,dc=edu
-subjectApi.source.ldap.param.SECURITY_CREDENTIALS.value = password
+
+## replaced with new LDAPTIVE lib
+#subjectApi.source.ldap.param.INITIAL_CONTEXT_FACTORY.value = com.sun.jndi.ldap.LdapCtxFactory
+#subjectApi.source.ldap.param.PROVIDER_URL.value = ldap://data:389
+#subjectApi.source.ldap.param.SECURITY_AUTHENTICATION.value = simple
+#subjectApi.source.ldap.param.SECURITY_PRINCIPAL.value = cn=admin,dc=internet2,dc=edu
+#subjectApi.source.ldap.param.SECURITY_CREDENTIALS.value.elConfig = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+#subjectApi.source.ldap.param.VTLDAP_VALIDATOR.value = ConnectLdapValidator
+
subjectApi.source.ldap.param.SubjectID_AttributeType.value = uid
subjectApi.source.ldap.param.SubjectID_formatToLowerCase.value = false
subjectApi.source.ldap.param.Name_AttributeType.value = cn
subjectApi.source.ldap.param.Description_AttributeType.value = cn
-subjectApi.source.ldap.param.VTLDAP_VALIDATOR.value = ConnectLdapValidator
subjectApi.source.ldap.param.subjectVirtualAttribute_0_searchAttribute0.value = ${subjectUtils.defaultIfBlank(subject.getAttributeValueOrCommaSeparated('uid'), "")},${subjectUtils.defaultIfBlank(subject.getAttributeValueOrCommaSeparated('cn'), "")},${subjectUtils.defaultIfBlank(subject.getAttributeValueOrCommaSeparated('exampleEduRegId'), "")}
subjectApi.source.ldap.param.sortAttribute0.value = cn
subjectApi.source.ldap.param.searchAttribute0.value = searchAttribute0
@@ -55,7 +61,7 @@ subjectApi.source.ldap.param.searchAttribute0.value = searchAttribute0
# Each subject has one and only on ID. Returns one result when searching for one ID.
subjectApi.source.ldap.search.searchSubject.param.filter.value = (&(uid=%TERM%)(objectclass=person))
subjectApi.source.ldap.search.searchSubject.param.scope.value = SUBTREE_SCOPE
-subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people,dc=internet2,dc=edu
+subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people
#searchSubjectByIdentifier: find a subject by identifier. Identifier is anything that uniquely
# identifies the user, e.g. jsmith or jsmith@institution.edu.
@@ -63,13 +69,13 @@ subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people,dc=inte
# even across sources. Returns one result when searching for one identifier.
subjectApi.source.ldap.search.searchSubjectByIdentifier.param.filter.value = (&(|(uid=%TERM%)(employeeNumber=%TERM%))(objectclass=person))
subjectApi.source.ldap.search.searchSubjectByIdentifier.param.scope.value = SUBTREE_SCOPE
-subjectApi.source.ldap.search.searchSubjectByIdentifier.param.base.value = ou=people,dc=internet2,dc=edu
+subjectApi.source.ldap.search.searchSubjectByIdentifier.param.base.value = ou=people
# search: find subjects by free form search. Returns multiple results.
subjectApi.source.ldap.search.search.param.filter.value = (&(|(|(uid=%TERM%)(cn=*%TERM%*))(uid=%TERM%*))(objectclass=person))
subjectApi.source.ldap.search.search.param.scope.value = SUBTREE_SCOPE
-subjectApi.source.ldap.search.search.param.base.value = ou=people,dc=internet2,dc=edu
+subjectApi.source.ldap.search.search.param.base.value = ou=people
subjectApi.source.ldap.attributes = givenName, sn, uid, mail, employeeNumber
subjectApi.source.ldap.internalAttributes = searchAttribute0
diff --git a/test-compose/data/container_files/seed-data/bootstrap.gsh b/test-compose/data/container_files/seed-data/bootstrap.gsh
index e2a018aa..b8d9c9f7 100644
--- a/test-compose/data/container_files/seed-data/bootstrap.gsh
+++ b/test-compose/data/container_files/seed-data/bootstrap.gsh
@@ -1,3 +1,10 @@
gs = GrouperSession.startRootSession()
+addStem("","app", "enterprise applications access control policy")
+addStem("","basis", "groups used exclusively by the IAM team to build reference groups")
+addStem("","bundle", "sets of reference groups used in policy for many services")
+addStem("","org", "delegated authority, ad-hoc groups, org owned apps or reference groups")
+addStem("","ref", "reference groups (i.e. institutional meaningful cohorts)")
+addStem("","test", "test folder for system verification")
+
addMember("etc:sysadmingroup","banderson");
From e7cbf6f72c9539e7dae8bffa76eab2ad298324a7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 7 Sep 2018 09:15:02 -0400
Subject: [PATCH 059/176] Update grouper.installer.properties
---
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 5e5778d8..bc4e1b30 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_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
#### 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 f36b8560e2070b2ce206833ae2ed5eab23673a93 Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Fri, 7 Sep 2018 09:48:14 -0400
Subject: [PATCH 060/176] 2.4 config updates
---
.../grouper/grouper-loader.properties | 4 +-
.../conf/grouper-loader.properties | 64 +++++++++++++++++++
test-compose/docker-compose.yml | 15 +++++
3 files changed, 81 insertions(+), 2 deletions(-)
create mode 100644 test-compose/data/container_files/conf/grouper-loader.properties
diff --git a/test-compose/configs-and-secrets/grouper/grouper-loader.properties b/test-compose/configs-and-secrets/grouper/grouper-loader.properties
index c406f91a..68bef05f 100644
--- a/test-compose/configs-and-secrets/grouper/grouper-loader.properties
+++ b/test-compose/configs-and-secrets/grouper/grouper-loader.properties
@@ -14,8 +14,8 @@ ldap.demo.url = ldap://data:389/dc=internet2,dc=edu
ldap.demo.user = cn=admin,dc=internet2,dc=edu
#optional, if authenticated note the password can be stored encrypted in an external file
-#ldap.demo.pass = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
-ldap.demo.pass = password
+ldap.demo.pass.elConfig = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+#ldap.demo.pass = password
#optional, if you are using tls, set this to true. Generally you will not be using an SSL URL to use TLS...
ldap.demo.tls = false
diff --git a/test-compose/data/container_files/conf/grouper-loader.properties b/test-compose/data/container_files/conf/grouper-loader.properties
new file mode 100644
index 00000000..c7d0bcbc
--- /dev/null
+++ b/test-compose/data/container_files/conf/grouper-loader.properties
@@ -0,0 +1,64 @@
+#################################
+## LDAP connections
+#################################
+# specify the ldap connection with user, pass, url
+# the string after "ldap." is the ID of the connection, and it should not have
+# spaces or other special chars in it. In this case is it "personLdap"
+
+#note the URL should start with ldap: or ldaps: if it is SSL.
+#It should contain the server and port (optional if not default), and baseDn,
+#e.g. ldaps://ldapserver.school.edu:636/dc=school,dc=edu
+ldap.demo.url = ldap://localhost:389/dc=internet2,dc=edu
+
+#optional, if authenticated
+ldap.demo.user = cn=admin,dc=internet2,dc=edu
+#ldap.demo.user = cn=admin
+
+#optional, if authenticated note the password can be stored encrypted in an external file
+#ldap.demo.pass = ${java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('SUBJECT_SOURCE_LDAP_PASSWORD')}
+ldap.demo.pass = password
+
+#optional, if you are using tls, set this to true. Generally you will not be using an SSL URL to use TLS...
+ldap.demo.tls = false
+
+#optional, if using sasl
+#ldap.personLdap.saslAuthorizationId =
+#ldap.personLdap.saslRealm =
+
+#optional (note, time limit is for search operations, timeout is for connection timeouts),
+#most of these default to vt-ldap defaults. times are in millis
+#validateOnCheckout defaults to true if all other validate methods are false
+#ldap.personLdap.batchSize =
+#ldap.personLdap.countLimit =
+#ldap.personLdap.timeLimit =
+#ldap.personLdap.timeout =
+#ldap.personLdap.minPoolSize =
+#ldap.personLdap.maxPoolSize =
+#ldap.personLdap.validateOnCheckIn =
+#ldap.personLdap.validateOnCheckOut =
+#ldap.personLdap.validatePeriodically =
+#ldap.personLdap.validateTimerPeriod =
+#ldap.personLdap.pruneTimerPeriod =
+#if connections expire after a certain amount of time, this is it, in millis, defaults to 300000 (5 minutes)
+#ldap.personLdap.expirationTime =
+
+#make the paths fully qualified and not relative to the loader group.
+loader.ldap.requireTopStemAsStemFromConfigGroup=false
+
+#####################################
+## Messaging integration with change log
+#####################################
+changeLog.consumer.rabbitMqMessagingSample.quartzCron = 0 * * * * ?
+
+# note, change "messagingSample" in key to be the name of the consumer. e.g. changeLog.consumer.someNameAnyName.class
+changeLog.consumer.rabbitMqMessagingSample.class = edu.internet2.middleware.grouper.changeLog.esb.consumer.EsbConsumer
+
+changeLog.consumer.rabbitMqMessagingSample.publisher.class = edu.internet2.middleware.grouper.changeLog.esb.consumer.EsbMessagingPublisher
+changeLog.consumer.rabbitMqMessagingSample.publisher.messagingSystemName = rabbitmq
+# note, routingKey property is valid only for rabbitmq. For other messaging systems, it is ignored.
+changeLog.consumer.rabbitMqMessagingSample.publisher.routingKey =
+## queue or topic
+changeLog.consumer.rabbitMqMessagingSample.publisher.messageQueueType = queue
+changeLog.consumer.rabbitMqMessagingSample.publisher.queueOrTopicName = sampleQueue
+## this is optional if not using "id" for subjectId, need to be a subject attribute in the sources.xml
+#changeLog.consumer.rabbitMqMessagingSample.publisher.addSubjectAttributes = email
diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index bf11466c..c0e21ed3 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -198,7 +198,22 @@ services:
ports:
- "389:389"
- "3306:3306"
+ secrets:
+ - database_password.txt
+ - rabbitmq_password.txt
+ - source: grouper.hibernate.properties
+ target: grouper_grouper.hibernate.properties
+ - source: grouper-loader.properties
+ target: grouper_grouper-loader.properties
+ - source: subject.properties
+ target: grouper_subject.properties
volumes:
+ - type: bind
+ source: ./configs-and-secrets/grouper/grouper.properties
+ target: /opt/grouper/conf/grouper.properties
+ - type: bind
+ source: ./configs-and-secrets/grouper/grouper.client.properties
+ target: /opt/grouper/conf/grouper.client.properties
- grouper_mysql:/var/lib/mysql
- grouper_ldap:/var/lib/dirsrv
From 7b24ed0c528d37d9ff1323820c168b7050dbbe1d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 09:17:44 -0400
Subject: [PATCH 061/176] Update grouper.installer.properties
---
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 bc4e1b30..4b08cf86 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_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_20
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_21
#### 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 e4af63fc294342ca20de78343f95bb7182558727 Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 11:17:05 -0400
Subject: [PATCH 062/176] fixed web.xml shib for 2.4
---
container_files/grouper.installer.properties | 2 +-
container_files/ui/web.xml | 174 ++++---------------
test-compose/ui/Dockerfile | 1 +
3 files changed, 32 insertions(+), 145 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index be9cd2b0..fa0f8b8d 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,7 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.installAllPatches = true
# grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_108,grouper_v2_3_0_ui_patch_45,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_16
+ grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_0,grouper_v2_3_0_ui_patch_0,grouper_v2_3_0_ws_patch_0,grouper_v2_3_0_pspng_patch_0
#### 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/ui/web.xml b/container_files/ui/web.xml
index 92d4125d..f3aa302f 100644
--- a/container_files/ui/web.xml
+++ b/container_files/ui/web.xml
@@ -1,203 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.s
-un.com/xml/ns/j2ee/web-app_2_4.xsd">
-<!--DO NOT EDIT THIS FILE. IT WILL BE OVERWRITTEN. CHANGE YOUR FILE specified by the build.properties value [additional.web.xml]. The contents of that file are merged into ${grouper-ui}/w
-ebapp/WEB-INF/web.core.xml-->
-<!--In webapp-->
-<!--Processing context-param-->
-<!--Processing filter-->
-<!--Inserting tag from merge file-->
-<filter>
+<web-app xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+ <filter>
<filter-name>GrouperUi</filter-name>
<filter-class>edu.internet2.middleware.grouper.ui.GrouperUiFilter</filter-class>
-</filter>
-<!--Inserting tag from merge file-->
-<filter>
- <filter-name>Error Catcher</filter-name>
- <filter-class>edu.internet2.middleware.grouper.ui.ErrorFilter</filter-class>
</filter>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter>
- <filter-name>Login check</filter-name>
- <filter-class>edu.internet2.middleware.grouper.ui.LoginCheckFilter</filter-class>
- <init-param>
- <param-name>failureUrl</param-name>
- <param-value>/index.jsp</param-value>
- </init-param>
- <init-param>
- <param-name>ignore</param-name>
- <param-value>:/populateIndex.do:/callLogin.do:/error.do:/logout.do:/status:</param-value>
- </init-param>
- <init-param>
- <param-name>grouperRole</param-name>
- <param-value>*</param-value>
- </init-param>
- </filter>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter>
- <filter-name>Caller page</filter-name>
- <filter-class>edu.internet2.middleware.grouper.ui.CallerPageFilter</filter-class>
- </filter>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter>
+ <filter>
<filter-name>CSRFGuard</filter-name>
<filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
</filter>
-<!--Processing filter-mapping-->
-<!--Inserting tag from merge file-->
-<filter-mapping>
- <filter-name>GrouperUi</filter-name>
- <url-pattern>*.do</url-pattern>
- </filter-mapping>
-<!--Inserting tag from merge file-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>GrouperUi</filter-name>
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
-<!--Inserting tag from merge file-->
-<filter-mapping>
- <filter-name>Error Catcher</filter-name>
- <url-pattern>*.do</url-pattern>
- </filter-mapping>
-<!--Inserting tag from merge file-->
-<filter-mapping>
- <filter-name>Error Catcher</filter-name>
- <url-pattern>/gotoCallerPage</url-pattern>
- </filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>GrouperUi</filter-name>
<url-pattern>/grouperUi/app/*</url-pattern>
</filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>GrouperUi</filter-name>
<url-pattern>/grouperUi/appHtml/*</url-pattern>
</filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>GrouperUi</filter-name>
<url-pattern>/grouperExternal/app/*</url-pattern>
</filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
- <filter-name>GrouperUi</filter-name>
- <url-pattern>/grouperExternal/appHtml/*</url-pattern>
- </filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>GrouperUi</filter-name>
<url-pattern>/grouperExternal/public/UiV2Public.index</url-pattern>
</filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>GrouperUi</filter-name>
<url-pattern>/grouperExternal/public/UiV2Public.postIndex</url-pattern>
</filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
- <filter-name>Caller page</filter-name>
- <url-pattern>/gotoCallerPage</url-pattern>
- </filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
- <filter-name>Login check</filter-name>
- <url-pattern>*.do</url-pattern>
- </filter-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<filter-mapping>
+ <filter-mapping>
<filter-name>CSRFGuard</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-<!--Processing listener-->
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<listener>
- <listener-class>edu.internet2.middleware.grouper.ui.GrouperSessionAttributeListener</listener-class>
-</listener>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<listener>
+ <listener>
+ <listener-class>edu.internet2.middleware.grouper.ui.GrouperSessionAttributeListener</listener-class>
+ </listener>
+ <listener>
<listener-class>org.owasp.csrfguard.CsrfGuardServletContextListener</listener-class>
</listener>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<listener>
+ <listener>
<listener-class>org.owasp.csrfguard.CsrfGuardHttpSessionListener</listener-class>
</listener>
-<!--Processing servlet-->
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet>
+ <servlet>
<servlet-name>StatusServlet</servlet-name>
<display-name>Status Servlet</display-name>
<servlet-class>edu.internet2.middleware.grouper.j2ee.status.GrouperStatusServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet>
- <!-- Map the filter to a Servlet or URL -->
-
+ <servlet>
<servlet-name>UiServlet</servlet-name>
<servlet-class>edu.internet2.middleware.grouper.j2ee.GrouperUiRestServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet>
- <servlet-name>OwaspJavaScriptServlet</servlet-name>
- <servlet-class>org.owasp.csrfguard.servlet.JavaScriptServlet</servlet-class>
- </servlet>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet>
- <servlet-name>action</servlet-name>
- <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
- <init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/struts-config.xml</param-value>
- </init-param>
- <load-on-startup>2</load-on-startup>
+ <servlet>
+ <servlet-name>OwaspJavaScriptServlet</servlet-name>
+ <servlet-class>org.owasp.csrfguard.servlet.JavaScriptServlet</servlet-class>
</servlet>
-<!--Processing servlet-mapping-->
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
+ <servlet-mapping>
<servlet-name>StatusServlet</servlet-name>
<url-pattern>/status</url-pattern>
</servlet-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
+ <servlet-mapping>
<servlet-name>UiServlet</servlet-name>
<url-pattern>/grouperUi/app/*</url-pattern>
</servlet-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
+ <servlet-mapping>
<servlet-name>UiServlet</servlet-name>
<url-pattern>/grouperExternal/app/*</url-pattern>
</servlet-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
+ <servlet-mapping>
<servlet-name>UiServlet</servlet-name>
<url-pattern>/grouperExternal/public/UiV2Public.index</url-pattern>
</servlet-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
+ <servlet-mapping>
<servlet-name>UiServlet</servlet-name>
<url-pattern>/grouperExternal/public/UiV2Public.postIndex</url-pattern>
</servlet-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
- <servlet-name>OwaspJavaScriptServlet</servlet-name>
- <url-pattern>/grouperExternal/public/OwaspJavaScriptServlet</url-pattern>
- </servlet-mapping>
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>*.do</url-pattern>
+ <servlet-mapping>
+ <servlet-name>OwaspJavaScriptServlet</servlet-name>
+ <url-pattern>/grouperExternal/public/OwaspJavaScriptServlet</url-pattern>
</servlet-mapping>
-<!--Processing mime-mapping-->
-<!--Processing error-page-->
-<!--Processing error-page-->
-<!--Processing taglib-->
-<!--Processing resource-env-ref-->
-<!--Processing resource-ref-->
-<!--Processing security-constraint-->
-<!--Inserting tag from base file. Merge file was file:/opt/grouper.ui-2.3.0/temp/99.web.core-filters.xml-->
-<!--Processing env-entry-->
-<!--Processing ejb-ref-->
-<!--Processing ejb-local-ref-->
</web-app>
diff --git a/test-compose/ui/Dockerfile b/test-compose/ui/Dockerfile
index 8fec2ae0..672230a8 100644
--- a/test-compose/ui/Dockerfile
+++ b/test-compose/ui/Dockerfile
@@ -3,5 +3,6 @@ FROM tier/grouper:latest
LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
#COPY in custom css, images, etc
+ENV CLASSPATH=/
CMD ["ui"]
From 1b3d216a5b9e4862c1b3f2bbe2cf7440261eaddc Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 11:21:24 -0400
Subject: [PATCH 063/176] Added folders per the TIER Grouper Deployment Guide
---
.../data/container_files/seed-data/bootstrap.gsh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test-compose/data/container_files/seed-data/bootstrap.gsh b/test-compose/data/container_files/seed-data/bootstrap.gsh
index b8d9c9f7..4f902129 100644
--- a/test-compose/data/container_files/seed-data/bootstrap.gsh
+++ b/test-compose/data/container_files/seed-data/bootstrap.gsh
@@ -1,10 +1,10 @@
gs = GrouperSession.startRootSession()
-addStem("","app", "enterprise applications access control policy")
-addStem("","basis", "groups used exclusively by the IAM team to build reference groups")
-addStem("","bundle", "sets of reference groups used in policy for many services")
-addStem("","org", "delegated authority, ad-hoc groups, org owned apps or reference groups")
-addStem("","ref", "reference groups (i.e. institutional meaningful cohorts)")
-addStem("","test", "test folder for system verification")
+addStem("","app", "app")
+addStem("","basis", "basis")
+addStem("","bundle", "bundle")
+addStem("","org", "org")
+addStem("","ref", "ref")
+addStem("","test", "test")
addMember("etc:sysadmingroup","banderson");
From 6786a42ba91066f2ec451cc631c1aaf1113ac7b9 Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 11:40:42 -0400
Subject: [PATCH 064/176] Removed unneeded line
---
test-compose/ui/Dockerfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/test-compose/ui/Dockerfile b/test-compose/ui/Dockerfile
index 672230a8..8fec2ae0 100644
--- a/test-compose/ui/Dockerfile
+++ b/test-compose/ui/Dockerfile
@@ -3,6 +3,5 @@ FROM tier/grouper:latest
LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
#COPY in custom css, images, etc
-ENV CLASSPATH=/
CMD ["ui"]
From f08da3496bc79d2cabbf146d5c80339cbcc182af Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 12:08:10 -0400
Subject: [PATCH 065/176] Update README.md
---
README.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/README.md b/README.md
index c00d0dd8..47bcfdd5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,13 @@
[](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/)
+# Upgrading from 2.3 to 2.4
+
+If upgrading from Grouper version 2.3 to 2.4, modifications will be needed in subject.properties and grouper-loaders.proprties. Further details about this can be found at the following URL:
+https://spaces.at.internet2.edu/display/Grouper/vt-ldap+to+ldaptive+migration+for+LDAP+access
+
+Additional upgrade information can be found at the following URL: https://spaces.at.internet2.edu/display/Grouper/v2.4+Upgrade+Instructions+from+v2.3
+
# Supported tags
- latest
From 5f5120a79c74f6f2046a06ab14211353fd6fd094 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Sep 2018 12:21:12 -0400
Subject: [PATCH 066/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index fa0f8b8d..6ee5ce3a 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -14,9 +14,9 @@ grouperInstaller.default.installOrUpgrade = install
##
##############################
-grouperInstaller.autorun.installAllPatches = true
-# grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
- grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_0,grouper_v2_3_0_ui_patch_0,grouper_v2_3_0_ws_patch_0,grouper_v2_3_0_pspng_patch_0
+grouperInstaller.autorun.installAllPatches = false
+grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_0,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 a8a634ed4d07832862208dad22e8e314c8dc257b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 11 Sep 2018 12:46:36 -0400
Subject: [PATCH 067/176] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 47bcfdd5..edd47bb5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
# Upgrading from 2.3 to 2.4
-If upgrading from Grouper version 2.3 to 2.4, modifications will be needed in subject.properties and grouper-loaders.proprties. Further details about this can be found at the following URL:
+If upgrading from Grouper version 2.3 to 2.4 and using LDAP, modifications will be needed in subject.properties and grouper-loaders.proprties. Further details about this can be found at the following URL:
https://spaces.at.internet2.edu/display/Grouper/vt-ldap+to+ldaptive+migration+for+LDAP+access
Additional upgrade information can be found at the following URL: https://spaces.at.internet2.edu/display/Grouper/v2.4+Upgrade+Instructions+from+v2.3
From 442c07f4b0cc30b937967f30d3aad4ab2a0d13f7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 16 Sep 2018 12:02:43 -0400
Subject: [PATCH 068/176] api patch 1
---
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 6ee5ce3a..3d2b2f6d 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_4_0_api_patch_0,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_1,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 20aedfd9d143943eab72ff9f10aefebbe6bb893a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 18 Sep 2018 07:44:11 -0400
Subject: [PATCH 069/176] API patch 2
---
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 3d2b2f6d..e3b3dc58 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_4_0_api_patch_1,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_2,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 454e7c6db59d65b77330de284253d328dfd29744 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 1 Oct 2018 12:41:01 -0400
Subject: [PATCH 070/176] Update README.md
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index edd47bb5..933bbdf3 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
If upgrading from Grouper version 2.3 to 2.4 and using LDAP, modifications will be needed in subject.properties and grouper-loaders.proprties. Further details about this can be found at the following URL:
https://spaces.at.internet2.edu/display/Grouper/vt-ldap+to+ldaptive+migration+for+LDAP+access
+In particular, in subject.properties, *.param.base.value should be adjusted to only contain the RDN (Relative Distinguished Name), not the full DN. For example, "OU=People", not "OU=People,DC=domain,DC=edu"
+
Additional upgrade information can be found at the following URL: https://spaces.at.internet2.edu/display/Grouper/v2.4+Upgrade+Instructions+from+v2.3
# Supported tags
From 1f1797d7a98fd14559181fe0fec24b856f222384 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 2 Oct 2018 16:12:03 -0400
Subject: [PATCH 071/176] Testing Aqua Microscanner
---
Jenkinsfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8cb90349..c274a79a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,10 +51,12 @@ pipeline {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// test the environment
+ aquaMicroscanner imageName: "$maintainer/$imagename"
sh 'cd test-compose && ./compose.sh'
// bring down after testing
sh 'cd test-compose && docker-compose down'
baseImg.push("$tag")
+
}
}
}
From c83210b70804b22be5061bc18d914ec59c3e84b3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 14:34:07 -0400
Subject: [PATCH 072/176] testing clair scanner in jenkins
---
Jenkinsfile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c274a79a..95d84907 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,8 +50,13 @@ pipeline {
script {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+ // scan the image with clair
+ docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04
+ docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5
+ curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
+ chmod 755 clair-scanner
+ ./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename
// test the environment
- aquaMicroscanner imageName: "$maintainer/$imagename"
sh 'cd test-compose && ./compose.sh'
// bring down after testing
sh 'cd test-compose && docker-compose down'
From 9445f3111860f2b4547bcd9f860987ee4adad368 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 14:36:40 -0400
Subject: [PATCH 073/176] Update Jenkinsfile
---
Jenkinsfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 95d84907..a8c4c679 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,11 +51,11 @@ pipeline {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// scan the image with clair
- docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04
- docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5
- curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
- chmod 755 clair-scanner
- ./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename
+ sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
+ sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+ sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
+ sh 'chmod 755 clair-scanner'
+ sh './clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename'
// test the environment
sh 'cd test-compose && ./compose.sh'
// bring down after testing
From 298594f64d0733223e47d5f220d4a5d1ccd4ba64 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 14:55:10 -0400
Subject: [PATCH 074/176] hard coding image name temporarily
---
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a8c4c679..df57acc0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,18 +49,18 @@ pipeline {
steps {
script {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
- def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+ // def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// scan the image with clair
sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
sh 'chmod 755 clair-scanner'
- sh './clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename'
+ sh './clair-scanner --ip 172.17.0.1 -r test.out tier/grouper'
// test the environment
sh 'cd test-compose && ./compose.sh'
// bring down after testing
sh 'cd test-compose && docker-compose down'
- baseImg.push("$tag")
+ // baseImg.push("$tag")
}
}
From b156912162b65a7c005e74752b3ea955b079c2d7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:01:39 -0400
Subject: [PATCH 075/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index df57acc0..35cd096c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
sh 'chmod 755 clair-scanner'
- sh './clair-scanner --ip 172.17.0.1 -r test.out tier/grouper'
+ sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:$tag"
// test the environment
sh 'cd test-compose && ./compose.sh'
// bring down after testing
From 6d0199c3e570b2864809f5097418668d2dbef3bc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:22:37 -0400
Subject: [PATCH 076/176] Update Jenkinsfile
---
Jenkinsfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 35cd096c..5d5b035a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,18 +49,22 @@ pipeline {
steps {
script {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
- // def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+ def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// scan the image with clair
- sh 'docker run -p 5432:5432 -d --name db arminc/clair-db:2017-10-04'
- sh 'docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+ sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2017-10-04'
+ sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
sh 'chmod 755 clair-scanner'
sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:$tag"
- // test the environment
+ // test the environment
+ sh 'docker kill clairdb'
+ sh 'docker rm clairdb'
+ sh 'docker kill clair'
+ sh 'docker rm clair'
sh 'cd test-compose && ./compose.sh'
// bring down after testing
sh 'cd test-compose && docker-compose down'
- // baseImg.push("$tag")
+ baseImg.push("$tag")
}
}
From 846dc965af1c7b7a82e682d2170db3d13fd603e2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:35:02 -0400
Subject: [PATCH 077/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5d5b035a..9db4574d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,7 +55,7 @@ pipeline {
sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
sh 'chmod 755 clair-scanner'
- sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:$tag"
+ sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
// test the environment
sh 'docker kill clairdb'
sh 'docker rm clairdb'
From a4fa056cf65378f9d01ff49307b1df8bcbd59196 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 15:52:32 -0400
Subject: [PATCH 078/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9db4574d..17cdd795 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// scan the image with clair
- sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2017-10-04'
+ sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2018-10-04'
sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
sh 'chmod 755 clair-scanner'
From c08db92982f167125f376efcebabe0139591a771 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 4 Oct 2018 16:28:40 -0400
Subject: [PATCH 079/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 17cdd795..fb2ba008 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -51,7 +51,7 @@ pipeline {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
// scan the image with clair
- sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:2018-10-04'
+ sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
sh 'chmod 755 clair-scanner'
From fdfd1f6b82a615bd3d3a2add7720f811eea79577 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:31:29 -0400
Subject: [PATCH 080/176] Create clairscan.sh
---
tests/clairscan.sh | 72 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 tests/clairscan.sh
diff --git a/tests/clairscan.sh b/tests/clairscan.sh
new file mode 100644
index 00000000..99e36141
--- /dev/null
+++ b/tests/clairscan.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+startsecs=$(date +'%s')
+starttime=$(date +%H:%M:%S)
+
+echo 'starting:' ${starttime}
+
+#ensure clair-scanner
+if [ ! -s ./clair-scanner ]; then
+ echo 'downloading curl-scanner...'
+ curl -s -L -o ./clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
+ chmod 755 clair-scanner
+else
+ echo 'using existing clair-scanner...'
+fi
+
+#ensure DB container
+echo 'ensuring a fresh clair-db container...'
+docker ps | grep clair-db &>/dev/null
+if [ $? == "0" ]; then
+ echo 'removing existing clair-db container...'
+ docker kill db &>/dev/null
+ docker rm db &>/dev/null
+ docker run -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
+else
+ docker run -p 5432:5432 -d --name db arminc/clair-db:latest &>/dev/null
+fi
+sleep 30
+
+#ensure clair-scan container
+echo 'ensuring a fresh clair-scan container...'
+docker ps | grep clair-local-scan &>/dev/null
+if [ $? == "0" ]; then
+ echo 'removing existing clair-scan container...'
+ docker kill clair &>/dev/null
+ docker rm clair &>/dev/null
+ docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5 &>/dev/null
+else
+ docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.5 &>/dev/null
+fi
+sleep 30
+
+#get ip where clair-scanner will listen
+clairip=$(/sbin/ifconfig docker0 | grep 'inet ' | sed 's/^[[:space:]]*//g' | cut -f 2 -d ' ' | sed 's/^[[:space:]]*//g')
+echo 'sending ip addr' ${clairip} 'to clair-scan server...'
+
+#run scan
+echo 'running scan...'
+./clair-scanner --ip ${clairip} $1
+retcode=$?
+
+#eval results
+if [ $retcode == '0' ]; then
+ echo 'scan found nothing.'
+else
+ echo 'scan found issues.'
+fi
+
+#cleanup
+echo 'removing temporary containers...'
+docker kill clair &>/dev/null
+docker rm clair &>/dev/null
+docker kill db &>/dev/null
+docker rm db &>/dev/null
+
+endsecs=$(date +'%s')
+endtime=$(date +%H:%M:%S)
+echo 'finished:' $endtime ' ('$((endsecs - startsecs)) 'seconds)'
+echo ""
+
+#pass along return code from scan
+exit $retcode
From d5241b56d33d634e200f23b2c8e3b27f35a2bbaa Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:33:25 -0400
Subject: [PATCH 081/176] Create main.bats
---
tests/main.bats | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 tests/main.bats
diff --git a/tests/main.bats b/tests/main.bats
new file mode 100644
index 00000000..73d3cf82
--- /dev/null
+++ b/tests/main.bats
@@ -0,0 +1,33 @@
+#!/usr/bin/env bats
+
+load ../common
+
+@test "010 Image is present and healthy" {
+ docker image inspect ${maintainer}/${imagename}
+}
+
+@test "030 Port 443/https is listening" {
+ docker run -d ${maintainer}/${imagename}
+ sleep 25
+ #get cont id
+ contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
+ run docker exec -i ${contid} sh -c 'cat < /dev/null > /dev/tcp/127.0.0.1/443'
+ docker kill ${contid} &>/dev/null
+ docker rm ${contid} &>/dev/null
+ [ "$status" -eq 0 ]
+}
+
+@test "040 The Grouper Status page is present" {
+ docker run -d ${maintainer}/${imagename}
+ sleep 60
+ contid2=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
+ run docker exec -i ${contid2} sh -c 'curl -I -k -s -f https://127.0.0.1/grouper/status?diagnosticType=trivial'
+ docker kill ${contid2} &>/dev/null
+ docker rm ${contid2} &>/dev/null
+ [ "$status" -eq 0 ]
+}
+
+
+@test "070 There are no known security vulnerabilities" {
+ ./tests/clairscan.sh ${maintainer}/${imagename}
+}
From 91c611f8aa3c172896b5f17009c56b60e6639dac Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:41:05 -0400
Subject: [PATCH 082/176] Update Jenkinsfile
---
Jenkinsfile | 55 +++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 41 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fb2ba008..0d52ba13 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,24 +46,51 @@ pipeline {
}
}
stage('Build') {
+ steps {
+ script {
+ try{
+ sh 'bin/rebuild.sh &> debug'
+ } catch(error) {
+ def error_details = readFile('./debug');
+ def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
+ sh "rm -f ./debug"
+ handleError(message)
+ }
+ }
+ }
+ stage('Test') {
+ steps {
+ script {
+ try {
+ sh 'bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0'
+ } catch (error) {
+ def error_details = readFile('./debug')
+ def message = "BUILD ERROR: There was a problem testing ${imagename}:${tag}. \n\n ${error_details}"
+ sh "rm -f ./debug"
+ handleError(message)
+ }
+ }
+ }
+
+ stage('Push') {
steps {
script {
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
- // scan the image with clair
- sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
- sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
- sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
- sh 'chmod 755 clair-scanner'
- sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
- // test the environment
- sh 'docker kill clairdb'
- sh 'docker rm clairdb'
- sh 'docker kill clair'
- sh 'docker rm clair'
- sh 'cd test-compose && ./compose.sh'
- // bring down after testing
- sh 'cd test-compose && docker-compose down'
+ //// scan the image with clair
+ // sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
+ // sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
+ // sh 'curl -L -o clair-scanner https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64'
+ // sh 'chmod 755 clair-scanner'
+ // sh "./clair-scanner --ip 172.17.0.1 -r test.out $maintainer/$imagename:latest"
+ //// test the environment
+ // sh 'docker kill clairdb'
+ // sh 'docker rm clairdb'
+ // sh 'docker kill clair'
+ // sh 'docker rm clair'
+ // sh 'cd test-compose && ./compose.sh'
+ //// bring down after testing
+ //sh 'cd test-compose && docker-compose down'
baseImg.push("$tag")
}
From a783a1a4402382834e087338457bef28bd99b2dc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:44:23 -0400
Subject: [PATCH 083/176] Update Jenkinsfile
---
Jenkinsfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0d52ba13..9b43e606 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,6 +57,7 @@ pipeline {
handleError(message)
}
}
+ }
}
stage('Test') {
steps {
@@ -70,6 +71,7 @@ pipeline {
handleError(message)
}
}
+ }
}
stage('Push') {
From e56671814d9d7b9222ff482fa683601c5d1b867e Mon Sep 17 00:00:00 2001
From: Chris Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 12:56:23 -0400
Subject: [PATCH 084/176] added x bit
---
tests/clairscan.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tests/clairscan.sh
diff --git a/tests/clairscan.sh b/tests/clairscan.sh
old mode 100644
new mode 100755
From d37730b882f051c8a591d760ac22f657c485b63c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:01:41 -0400
Subject: [PATCH 085/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9b43e606..c764ea9b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
steps {
script {
try{
- sh 'bin/rebuild.sh &> debug'
+ sh 'bin/rebuild.sh | tee debug ; test ${PIPESTATUS[0]} -eq 0'
} catch(error) {
def error_details = readFile('./debug');
def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
From effd5212d768694f1fe4c27760529ff233296219 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:03:05 -0400
Subject: [PATCH 086/176] Update main.bats
---
tests/main.bats | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/tests/main.bats b/tests/main.bats
index 73d3cf82..e7be030f 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -17,16 +17,6 @@ load ../common
[ "$status" -eq 0 ]
}
-@test "040 The Grouper Status page is present" {
- docker run -d ${maintainer}/${imagename}
- sleep 60
- contid2=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
- run docker exec -i ${contid2} sh -c 'curl -I -k -s -f https://127.0.0.1/grouper/status?diagnosticType=trivial'
- docker kill ${contid2} &>/dev/null
- docker rm ${contid2} &>/dev/null
- [ "$status" -eq 0 ]
-}
-
@test "070 There are no known security vulnerabilities" {
./tests/clairscan.sh ${maintainer}/${imagename}
From 5a963c1c96633f5640f4acb5c4dacfd8e57f3506 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:07:01 -0400
Subject: [PATCH 087/176] Update main.bats
---
tests/main.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index e7be030f..d70655b0 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -7,7 +7,7 @@ load ../common
}
@test "030 Port 443/https is listening" {
- docker run -d ${maintainer}/${imagename}
+ docker run -d ${maintainer}/${imagename} ui
sleep 25
#get cont id
contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
From 4cc64f08da86be058624260f87bcf6e53860f91d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:23:49 -0400
Subject: [PATCH 088/176] Update main.bats
---
tests/main.bats | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/tests/main.bats b/tests/main.bats
index d70655b0..cbe8ea2d 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -6,14 +6,9 @@ load ../common
docker image inspect ${maintainer}/${imagename}
}
-@test "030 Port 443/https is listening" {
- docker run -d ${maintainer}/${imagename} ui
- sleep 25
- #get cont id
- contid=$(docker ps | grep ${maintainer}/${imagename} | cut -f 1 -d ' ')
- run docker exec -i ${contid} sh -c 'cat < /dev/null > /dev/tcp/127.0.0.1/443'
- docker kill ${contid} &>/dev/null
- docker rm ${contid} &>/dev/null
+@test "030 Test Compose the environment" {
+ cd test-compose && ./compose.sh
+ cd test-compose && docker-compose down
[ "$status" -eq 0 ]
}
From cf745dae4e74bf2f12680a8a61876b09c886b197 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:31:46 -0400
Subject: [PATCH 089/176] Update main.bats
---
tests/main.bats | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/main.bats b/tests/main.bats
index cbe8ea2d..ade16fbd 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -7,8 +7,7 @@ load ../common
}
@test "030 Test Compose the environment" {
- cd test-compose && ./compose.sh
- cd test-compose && docker-compose down
+ cd test-compose && ./compose.sh && docker-compose down
[ "$status" -eq 0 ]
}
From 5c9e23c40bf8b23aa96a385b05a3b523b02cd9ef Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:33:27 -0400
Subject: [PATCH 090/176] Update main.bats
---
tests/main.bats | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index ade16fbd..8a865bfe 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -8,7 +8,6 @@ load ../common
@test "030 Test Compose the environment" {
cd test-compose && ./compose.sh && docker-compose down
- [ "$status" -eq 0 ]
}
From 7d975abdfbfaed9fa2b845dda13b9da652a2728b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:38:27 -0400
Subject: [PATCH 091/176] Update main.bats
---
tests/main.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index 8a865bfe..973dc981 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
@test "070 There are no known security vulnerabilities" {
- ./tests/clairscan.sh ${maintainer}/${imagename}
+ ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
}
From 1b24c3b8d9aee55f534577f0508f0a1c7d9cbfa3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 8 Oct 2018 13:43:49 -0400
Subject: [PATCH 092/176] Update Jenkinsfile
---
Jenkinsfile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index c764ea9b..823b222e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,6 +28,9 @@ pipeline {
sh 'ls'
sh 'mv bin/* ../bin/.'
}
+ // Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
+ // We don't care if there are more 'tag' assignments there. The latest one wins.
+ sh "echo >> common.bash ; echo \"tag=\\\"${tag}\\\"\" >> common.bash ; echo common.bash ; cat common.bash"
}
}
}
From fe4fdf42237d95ba7520777b99b7358311ba7a11 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 11:45:25 -0400
Subject: [PATCH 093/176] Update Jenkinsfile
---
Jenkinsfile | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 823b222e..a015af5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,7 @@
pipeline {
agent any
+ def baseImg
environment {
maintainer = "t"
imagename = 'g'
@@ -52,7 +53,9 @@ pipeline {
steps {
script {
try{
- sh 'bin/rebuild.sh | tee debug ; test ${PIPESTATUS[0]} -eq 0'
+ docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
+ baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+ }
} catch(error) {
def error_details = readFile('./debug');
def message = "BUILD ERROR: There was a problem building ${imagename}:${tag}. \n\n ${error_details}"
@@ -80,8 +83,6 @@ pipeline {
stage('Push') {
steps {
script {
- docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
- def baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
//// scan the image with clair
// sh 'docker run -p 5432:5432 -d --name clairdb arminc/clair-db:latest'
// sh 'docker run -p 6060:6060 --link clairdb:postgres -d --name clair arminc/clair-local-scan:v2.0.5'
@@ -97,9 +98,7 @@ pipeline {
//// bring down after testing
//sh 'cd test-compose && docker-compose down'
baseImg.push("$tag")
-
- }
- }
+ }
}
}
stage('Notify') {
From ffd56bd7fa472fa646224f4dd57ec7eb060c2f99 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 11:46:10 -0400
Subject: [PATCH 094/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a015af5e..1fab98ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
pipeline {
agent any
- def baseImg
+ def baseImg = ''
environment {
maintainer = "t"
imagename = 'g'
From 5f9098a2238d90d149a28b3ff5b036f66bc13910 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 11:46:48 -0400
Subject: [PATCH 095/176] Update Jenkinsfile
---
Jenkinsfile | 1 -
1 file changed, 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1fab98ac..0dedd0b3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,6 @@
pipeline {
agent any
- def baseImg = ''
environment {
maintainer = "t"
imagename = 'g'
From f0eae16956f9a9ff45bfc1b6030b85492a96867b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 12:03:22 -0400
Subject: [PATCH 096/176] Update main.bats
---
tests/main.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index 973dc981..8a865bfe 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
@test "070 There are no known security vulnerabilities" {
- ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
+ ./tests/clairscan.sh ${maintainer}/${imagename}
}
From 44b1d57b8d38c300ad1af369329761a25448b4af Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 12:24:02 -0400
Subject: [PATCH 097/176] Update Jenkinsfile
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 0dedd0b3..31cc94d1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -96,7 +96,9 @@ pipeline {
// sh 'cd test-compose && ./compose.sh'
//// bring down after testing
//sh 'cd test-compose && docker-compose down'
- baseImg.push("$tag")
+ docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
+ baseImg.push("$tag")
+ }
}
}
}
From 515c65090b0a1e93c426768cb71848aac0ad16dc Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 12:38:08 -0400
Subject: [PATCH 098/176] Update main.bats
---
tests/main.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index 8a865bfe..973dc981 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
@test "070 There are no known security vulnerabilities" {
- ./tests/clairscan.sh ${maintainer}/${imagename}
+ ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
}
From d179cf7e4ccc253c793501d27a29d1f84298de71 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 13:09:10 -0400
Subject: [PATCH 099/176] Update main.bats
---
tests/main.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index 973dc981..9dc81676 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
@test "070 There are no known security vulnerabilities" {
- ./tests/clairscan.sh ${maintainer}/${imagename}:${tag}
+ ./tests/clairscan.sh ${maintainer}/${imagename}:$latest
}
From 004636368bf0e53457ff203ca1caf27f5a9af8bf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 9 Oct 2018 13:41:05 -0400
Subject: [PATCH 100/176] Update main.bats
---
tests/main.bats | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/main.bats b/tests/main.bats
index 9dc81676..0c18d122 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -12,5 +12,5 @@ load ../common
@test "070 There are no known security vulnerabilities" {
- ./tests/clairscan.sh ${maintainer}/${imagename}:$latest
+ ./tests/clairscan.sh ${maintainer}/${imagename}:latest
}
From 2701cfa7fcc6a88a7485683c9e00c44407652cd5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 16 Oct 2018 12:49:47 -0400
Subject: [PATCH 101/176] Update grouper.installer.properties
---
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 e3b3dc58..2ed11a54 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_4_0_api_patch_2,grouper_v2_4_0_ui_patch_0,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_2,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 7ea8949bd23dc107d920ee1cbaaa10cdd325b841 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 31 Oct 2018 22:20:12 -0400
Subject: [PATCH 102/176] API patch 3
---
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 2ed11a54..7aeb8776 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_4_0_api_patch_2,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_3,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 cada700298286c8191a772e742b8a69886993058 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 7 Nov 2018 14:28:26 -0500
Subject: [PATCH 103/176] Update grouper.installer.properties
---
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 7aeb8776..c3b77116 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_4_0_api_patch_3,grouper_v2_4_0_ui_patch_1,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_6,grouper_v2_4_0_ui_patch_3,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 6f9502e1c22dd8e8dac4df28b57c23b7c57d0c89 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 7 Dec 2018 10:32:05 -0500
Subject: [PATCH 104/176] a11-u5-w0-p0
---
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 c3b77116..967b0d10 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_4_0_api_patch_6,grouper_v2_4_0_ui_patch_3,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_5,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 de3486b0b3b62ba274e383e6fa92429b485577d7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 7 Dec 2018 10:47:45 -0500
Subject: [PATCH 105/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 31cc94d1..2b7b801b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
dir('tmp'){
git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
sh 'ls'
- sh 'mv bin/* ../bin/.'
+ sh 'mv bin/* ../bin'
}
// Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
// We don't care if there are more 'tag' assignments there. The latest one wins.
From 67cf458ab4b887510c633de3d7ca86159c79161f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 12:29:02 -0500
Subject: [PATCH 106/176] Update grouper.installer.properties
---
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 967b0d10..ce6477e9 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_4_0_api_patch_11,grouper_v2_4_0_ui_patch_5,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_6,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
#### 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 9891cf0784fdcfd812f9c43b0e75cd0bb5daebca Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 12:33:20 -0500
Subject: [PATCH 107/176] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2b7b801b..d7b0dc62 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -53,7 +53,7 @@ pipeline {
script {
try{
docker.withRegistry('https://registry.hub.docker.com/', "dockerhub-$maintainer") {
- baseImg = docker.build("$maintainer/$imagename", "--no-cache .")
+ baseImg = docker.build("$maintainer/$imagename", "--build-arg GROUPER_CONTAINER_VERSION=$tag --no-cache .")
}
} catch(error) {
def error_details = readFile('./debug');
From b12c150413b73fa63c05845efbe1bc23ca15e7d8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 15:38:43 -0500
Subject: [PATCH 108/176] Update Dockerfile
---
Dockerfile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index eee6c126..d618b9fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,9 +3,12 @@ FROM centos:centos7 as installing
RUN yum update -y \
&& yum install -y wget tar unzip dos2unix \
&& yum clean all
+
+ARG GROUPER_CONTAINER_VERSION
ENV GROUPER_VERSION=2.4.0 \
- JAVA_HOME=/usr/lib/jvm/zulu-8/
+ JAVA_HOME=/usr/lib/jvm/zulu-8/ \
+ GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
# use Zulu package
RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems \
From f76052103703ee7855a7df24e53ecbc08deac249 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 16:05:54 -0500
Subject: [PATCH 109/176] Update Dockerfile
---
Dockerfile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d618b9fe..accfc65b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -96,10 +96,15 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
ImageType="Grouper" \
ImageName=$imagename \
ImageOS=centos7
+
+ARG GROUPER_CONTAINER_VERSION
ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
PATH=$PATH:$JAVA_HOME/bin \
- GROUPER_HOME=/opt/grouper/grouper.apiBinary
+ GROUPER_HOME=/opt/grouper/grouper.apiBinary \
+ GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
+
+
RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
From bfa62a7b3c076370cc4e6b2abea1d297760425ee Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 4 Jan 2019 16:09:41 -0500
Subject: [PATCH 110/176] Update Dockerfile
---
Dockerfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index accfc65b..e5f412bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -102,9 +102,7 @@ ARG GROUPER_CONTAINER_VERSION
ENV JAVA_HOME=/usr/lib/jvm/zulu-8/ \
PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouper.apiBinary \
- GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
-
-
+ GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
From 39679df77ca065557efdd77fecb3d2ccd0c223f4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 7 Jan 2019 11:08:54 -0500
Subject: [PATCH 111/176] Update grouper.installer.properties
---
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 ce6477e9..d79ed61d 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_4_0_api_patch_11,grouper_v2_4_0_ui_patch_6,grouper_v2_4_0_ws_patch_0,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_11,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
#### 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 ed2fbd50591b24ceed77c583d23c4142ccf7b327 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 7 Jan 2019 13:31:11 -0500
Subject: [PATCH 112/176] Update grouper.installer.properties
---
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 d79ed61d..1d78ed2f 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_4_0_api_patch_11,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_13,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
#### 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 661fb87da7cb32433d0829f17dea1c02d92711d7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 8 Jan 2019 16:32:08 -0500
Subject: [PATCH 113/176] Update grouper.installer.properties
---
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 1d78ed2f..2cbef7ea 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_4_0_api_patch_13,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_14,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
#### 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 8784d7534988a1ed84a5d4cc5d0df68eaa5866ea Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 15 Jan 2019 05:46:23 -0500
Subject: [PATCH 114/176] Update grouper.installer.properties
---
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 2cbef7ea..dd108d85 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_4_0_api_patch_14,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_17,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
#### 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 79be192561a81321d461efb440f90262e6eb0280 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 16 Jan 2019 20:35:24 -0500
Subject: [PATCH 115/176] Update grouper.installer.properties
---
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 dd108d85..b47a51eb 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_4_0_api_patch_17,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_19,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
#### 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 3bf230f45e822400155c6c55b38df857b2d0126f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 29 Jan 2019 08:20:10 -0500
Subject: [PATCH 116/176] Update grouper.installer.properties
---
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 b47a51eb..7f2f9b4b 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_4_0_api_patch_19,grouper_v2_4_0_ui_patch_8,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_0
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_19,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_2
#### 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 ab1f9481075b4538d1ad404ed1eeef97eb9ee21f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 6 Feb 2019 12:04:48 -0500
Subject: [PATCH 117/176] Update grouper.installer.properties
---
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 7f2f9b4b..cafa7c87 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_4_0_api_patch_19,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_1,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_23,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
#### 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 f32bc0610f708873c8028fdf514956db139d1fe7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 7 Feb 2019 15:46:56 -0500
Subject: [PATCH 118/176] Update grouper.installer.properties
---
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 cafa7c87..dbe725eb 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_4_0_api_patch_23,grouper_v2_4_0_ui_patch_9,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_25,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
#### 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 795bd16cfdde80909df5855d26a88ea603416a22 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 8 Feb 2019 14:15:30 -0500
Subject: [PATCH 119/176] Update grouper.installer.properties
---
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 dbe725eb..5644c5cb 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_4_0_api_patch_25,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_26,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
#### 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 76ac8667cc6debf5405533a58c1dfd855a37609a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 8 Feb 2019 16:31:42 -0500
Subject: [PATCH 120/176] Update grouper.installer.properties
---
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 4b08cf86..b2acf050 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_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_12,grouper_v2_3_0_pspng_patch_21
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_3_0_api_patch_109,grouper_v2_3_0_ui_patch_47,grouper_v2_3_0_ws_patch_13,grouper_v2_3_0_pspng_patch_24
#### 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 8ebeef12fa7f5e77f49059e4915d6cf84d80e097 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 11 Feb 2019 15:10:00 -0500
Subject: [PATCH 121/176] Update grouper.installer.properties
---
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 5644c5cb..a20f71f2 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_4_0_api_patch_26,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_27,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
#### 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 8e0f56764a5087587ae00e0d055efda9f77f4bfe Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Feb 2019 10:42:27 -0500
Subject: [PATCH 122/176] Update Jenkinsfile
---
Jenkinsfile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 8cb90349..f97f1526 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,11 @@ pipeline {
echo "You must define an imagename in common.bash"
currentBuild.result = 'FAILURE'
}
- sh 'mkdir -p bin'
- sh 'mkdir -p tmp'
+ sh 'mkdir -p tmp && mkdir -p bin'
dir('tmp'){
git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
- sh 'ls'
- sh 'mv bin/* ../bin/.'
+ sh 'rm -rf ../bin/*'
+ sh 'mv ./bin/* ../bin/.'
}
}
}
From 08e687a9d383bcc4d81e86886ddbc370dcef949f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 17 Feb 2019 12:00:56 -0500
Subject: [PATCH 123/176] Update grouper.installer.properties
---
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 a20f71f2..6b0241d0 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_4_0_api_patch_27,grouper_v2_4_0_ui_patch_11,grouper_v2_4_0_ws_patch_2,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_29,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_2
#### 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 71bc2ee834aed674e30e44c245d668fc56c93fe0 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 26 Feb 2019 16:58:26 -0500
Subject: [PATCH 124/176] Update README.md
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 933bbdf3..2c5c73cb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-[](https://jenkins.testbed.tier.internet2.edu/job/docker/job/grouper/job/master/)
+[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)
+
# Upgrading from 2.3 to 2.4
From 6275b358b1c93c6e44605e7067ed45f070764baf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 26 Feb 2019 17:05:02 -0500
Subject: [PATCH 125/176] Update Jenkinsfile
---
Jenkinsfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d7b0dc62..f07c3f43 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,12 +21,12 @@ pipeline {
echo "You must define an imagename in common.bash"
currentBuild.result = 'FAILURE'
}
- sh 'mkdir -p bin'
- sh 'mkdir -p tmp'
+
+ sh 'mkdir -p tmp && mkdir -p bin'
dir('tmp'){
git([ url: "https://github.internet2.edu/docker/util.git", credentialsId: "jenkins-github-access-token" ])
- sh 'ls'
- sh 'mv bin/* ../bin'
+ sh 'rm -rf ../bin/*'
+ sh 'mv ./bin/* ../bin/.'
}
// Build and test scripts expect that 'tag' is present in common.bash. This is necessary for both Jenkins and standalone testing.
// We don't care if there are more 'tag' assignments there. The latest one wins.
From 80ab1303d31dc0b37f6d8a9639899c7d7c2d3e95 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 4 Mar 2019 10:53:01 -0500
Subject: [PATCH 126/176] Update grouper.installer.properties
---
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 6b0241d0..92d1ffc2 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_4_0_api_patch_29,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_2
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_31,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
#### 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 a4cbae8551f12a55c2e83b162010e87ca97c81a2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Mar 2019 12:52:21 -0400
Subject: [PATCH 127/176] Update grouper.installer.properties
---
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 ee6acce7..dd32b019 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_4_0_api_patch_31,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 5297deb414a0480a582dce5b419cb010dfb042e4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 14 Mar 2019 12:17:36 -0400
Subject: [PATCH 128/176] Update grouper.installer.properties
---
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 dd32b019..5f0b79de 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_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_3,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From d56bc60e22684bc2764d9431d3676124f5d5fbfa Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 17 Mar 2019 09:56:49 -0400
Subject: [PATCH 129/176] Update grouper.installer.properties
---
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 5f0b79de..99142801 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_4_0_api_patch_32,grouper_v2_4_0_ui_patch_14,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_32,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 2af5dac90ab7a119641641b7a125fc4ed6241bc8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Mar 2019 08:33:38 -0400
Subject: [PATCH 130/176] Update grouper.installer.properties
---
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 99142801..90b9b7e4 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_4_0_api_patch_32,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_3
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_38,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From d96a3e16dea5036e011f16e6a9d51080a86fc1fd Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 15 Apr 2019 15:03:53 -0400
Subject: [PATCH 131/176] Update grouper.installer.properties
---
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 90b9b7e4..977942bc 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_4_0_api_patch_38,grouper_v2_4_0_ui_patch_18,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_41,grouper_v2_4_0_ui_patch_22,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From f208d3b6e60e95dda03d43e24ec82ddcf0b47861 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 26 Apr 2019 14:17:05 -0400
Subject: [PATCH 132/176] 2.4.0-a42-u23-w5-p4-20190426-rc1
---
container_files/grouper.installer.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 977942bc..36a97a89 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,7 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_41,grouper_v2_4_0_ui_patch_22,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+# 2.4.0-a42-u23-w5-p4-20190426-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From cc5917b8bae262d317da2d3bae442ab520e87745 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 26 Apr 2019 14:18:23 -0400
Subject: [PATCH 133/176] update shib_sp tag to 3.0.4_03122019
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e5f412bf..716d44c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -89,7 +89,7 @@ COPY container_files/tomcat/ /opt/tomcat/
COPY container_files/tomee/ /opt/tomee/
-FROM tier/shibboleth_sp
+FROM tier/shibboleth_sp:3.0.4_03122019
LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
Vendor="TIER" \
From ebe0ee41e798bbd30c8443ba3cf04facafacbc9f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 29 Apr 2019 10:24:54 -0400
Subject: [PATCH 134/176] 2.4.0-a42-u23-w5-p5-20190429-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 36a97a89..2eecedb4 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,8 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a42-u23-w5-p4-20190426-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_4
+# 2.4.0-a42-u23-w5-p5-20190429-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 564ee1f8ccad16e2806ead67e1790731e12f14b7 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 09:41:34 -0400
Subject: [PATCH 135/176] Update grouper.installer.properties
---
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 2eecedb4..0f38148b 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
-# 2.4.0-a42-u23-w5-p5-20190429-rc1
+# 2.4.0-a42-u23-w5-p6-20190501-rc1
grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
From adc5284703d09039757925847570bc2a027facc8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 11:32:55 -0400
Subject: [PATCH 136/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 0f38148b..e5d30b23 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -16,8 +16,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a42-u23-w5-p6-20190501-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_42,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
+# 2.4.0-a43-u23-w5-p6-20190501-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 6d4b379c3cca8091a3083b72d3f489b438b0620d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 15:09:10 -0400
Subject: [PATCH 137/176] Update grouper.installer.properties
---
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 e5d30b23..ed78b0bd 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,7 +17,7 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
# 2.4.0-a43-u23-w5-p6-20190501-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_5
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 0d5bb36795c1fc72b197b6bcb0b4bff9771db44d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 1 May 2019 15:45:13 -0400
Subject: [PATCH 138/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 1 +
1 file changed, 1 insertion(+)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ed78b0bd..3e30035c 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -14,6 +14,7 @@ grouperInstaller.default.installOrUpgrade = install
##
##############################
+grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
# 2.4.0-a43-u23-w5-p6-20190501-rc1
From cbc027e78e90be24d65b4f678a37d5ad5db55b37 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 6 May 2019 14:39:53 -0400
Subject: [PATCH 139/176] 2.4.0-a47-u23-w5-p6-20190506-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 3e30035c..ee30d9d7 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a43-u23-w5-p6-20190501-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_43,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a47-u23-w5-p6-20190506-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 08ab73f90daef019f200f526cd902eea8035347b Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 7 May 2019 16:44:50 -0600
Subject: [PATCH 140/176] Add HEALTCHECK NONE to fix gsh problem
---
Dockerfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index 716d44c9..920c2841 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,6 +144,8 @@ WORKDIR /opt/grouper/grouper.apiBinary/
EXPOSE 80 443
+HEALTHCHECK NONE
+
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
CMD ["bin/gsh", "-loader"]
From 3a1c0740e2809e971685f52e3ed8aa7c33dfe945 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 May 2019 13:28:11 -0400
Subject: [PATCH 141/176] 2.4.0-a47-u25-w5-p6-20190509-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ee30d9d7..3680125d 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a47-u23-w5-p6-20190506-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_23,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a47-u25-w5-p6-20190509-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From d2465097ac6368eb75488a6c97b0b6293bd8feb5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 15 May 2019 10:23:24 -0400
Subject: [PATCH 142/176] removing webapps/ROOT/ from container
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 716d44c9..a37e2a60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,7 @@ RUN cd /opt/grouper/grouper.apiBinary/; \
RUN cd /opt/tomcat/; \
chmod +r bin/log4j-*.jar; \
- rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ logs/* temp/* work/* conf/logging.properties
+ rm -fr webapps/docs/ webapps/examples/ webapps/host-manager/ webapps/manager/ webapps/ROOT/ logs/* temp/* work/* conf/logging.properties
RUN cd /opt/tomee/; \
chmod +r bin/log4j-*.jar; \
From c23674d7f82abac245155c0bfbcaa4e0e5affbaf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 15 May 2019 10:24:09 -0400
Subject: [PATCH 143/176] Update grouper-www.conf
---
container_files/httpd/grouper-www.conf | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/container_files/httpd/grouper-www.conf b/container_files/httpd/grouper-www.conf
index 368f7f6c..0108c5f8 100644
--- a/container_files/httpd/grouper-www.conf
+++ b/container_files/httpd/grouper-www.conf
@@ -7,6 +7,11 @@ ProxyPass /grouper ajp://localhost:8009/grouper timeout=2400
ProxyPass /grouper-ws ajp://localhost:8009/grouper-ws timeout=2400
ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim timeout=2400
+RewriteEngine on
+
+RewriteCond %{REQUEST_URI} "^/$"
+RewriteRule . %{REQUEST_SCHEME}://%{HTTP_HOST}/grouper/ [R=301,L]
+
<Location /grouper>
AuthType shibboleth
ShibRequestSetting requireSession 1
From 04394718dd5d9d19f6320ad091d3ebe4b5ca37b2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 15 May 2019 10:31:12 -0400
Subject: [PATCH 144/176] 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 0108c5f8..562e47c6 100644
--- a/container_files/httpd/grouper-www.conf
+++ b/container_files/httpd/grouper-www.conf
@@ -8,7 +8,6 @@ ProxyPass /grouper-ws ajp://localhost:8009/grouper-ws timeout=2400
ProxyPass /grouper-ws-scim ajp://localhost:8009/grouper-ws-scim timeout=2400
RewriteEngine on
-
RewriteCond %{REQUEST_URI} "^/$"
RewriteRule . %{REQUEST_SCHEME}://%{HTTP_HOST}/grouper/ [R=301,L]
From 3ca9108b3da4b0b56119fb257e236f63748ce41e Mon Sep 17 00:00:00 2001
From: Scott Koranda <skoranda@gmail.com>
Date: Sat, 8 Jun 2019 08:21:29 -0500
Subject: [PATCH 145/176] Fixed bad JEXL/elConfig example in README.md
The JEXL/elConfig example in the README.md documentation will not work
to read the database password from a file path pointed to by an
environment variable because the first argument to
org.apache.commons.io.FileUtils.readFileToString() must be an instance
of java.io.File and not String. This commit fixes that with an example
that is tested to work with Grouper 2.4.x.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2c5c73cb..d4b9069e 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ For passing full files into the container, this container will make any secrets
Docker Secrets can also be used to pass in strings, such as a database connection string password, into the component config. To pass in the Grouper database connection string, one might set the property and value as such:
```text
-hibernate.connection.password.elConfig = ${java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE'), "utf-8") : java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD') }
+hibernate.connection.password.elConfig = ${java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE') != null ? org.apache.commons.io.FileUtils.readFileToString(new("java.io.File", java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD_FILE')), "utf-8") : java.lang.System.getenv().get('GROUPER_DATABASE_PASSWORD') }
```
Note that the default property name has been changed by appending `.elConfig`. (This causes Grouper to evaluate the string before saving the value.) The expression allows deployers to use a file containing only the database password as a Docker Secret and reference the file name via the `GROUPER_DATABASE_PASSWORD_FILE` environment property. This allows the config files to be baked into the image, if desired. Also, but not recommended, the database password could just be set in the Docker Service definition as an environment variable, `GROUPER_DATABASE_PASSWORD`. (Technically the expression can be broken up and just the desired functionality used.) Of course, using Grouper's MorphString functionality is supported and likely is the best option, but does require more effort in setting it up.
From 904f6d87389de5cba61c546681ce155fd2b0ec1c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 12 Jun 2019 09:42:10 -0400
Subject: [PATCH 146/176] Update grouper.installer.properties
---
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 3680125d..0dd88fa2 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,7 +17,7 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a47-u25-w5-p6-20190509-rc1
+# 2.4.0-a64-u38-w6-p6-20190612-rc1
grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
From 4a49defa8148c4c81197e3febb879dd0fae7b972 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 12 Jun 2019 09:43:02 -0400
Subject: [PATCH 147/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 3680125d..e74a0f5f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a47-u25-w5-p6-20190509-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a64-u38-w6-p6-20190612-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From d0e8a62537dfef39ee2b420032c70c5e42e6f269 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 12 Jun 2019 14:41:23 -0400
Subject: [PATCH 148/176] Update grouper.installer.properties
---
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 0dd88fa2..e74a0f5f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -18,7 +18,7 @@ grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
# 2.4.0-a64-u38-w6-p6-20190612-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_47,grouper_v2_4_0_ui_patch_25,grouper_v2_4_0_ws_patch_5,grouper_v2_4_0_pspng_patch_6
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 1179e13d5cfdf2a2a4aca8481a8a89c22aed1276 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 25 Jun 2019 14:27:59 -0400
Subject: [PATCH 149/176] tomcat 8.5.42
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9471c34c..87435e24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,7 @@ RUN echo 'Installing Grouper'; \
FROM centos:centos7 as cleanup
ENV GROUPER_VERSION=2.4.0 \
- TOMCAT_VERSION=8.5.12 \
+ TOMCAT_VERSION=8.5.42 \
TOMEE_VERSION=7.0.0
COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/
From f1d4f8ef0f2877c6a6086f81ffe2b7223db10ac3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 29 Sep 2019 18:51:25 -0400
Subject: [PATCH 150/176] 2.4.0-a74-u44-w8-p11-20190929-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index e74a0f5f..809bbbe5 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a64-u38-w6-p6-20190612-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_64,grouper_v2_4_0_ui_patch_38,grouper_v2_4_0_ws_patch_6,grouper_v2_4_0_pspng_patch_6
+# 2.4.0-a74-u44-w8-p11-20190929-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_44,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 7836648e8642251273a0007204096297ed506639 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Sun, 29 Sep 2019 20:00:53 -0400
Subject: [PATCH 151/176] 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 cbb3ca2d..e4ffb7f8 100644
--- a/test-compose/data/Dockerfile
+++ b/test-compose/data/Dockerfile
@@ -11,7 +11,7 @@ RUN yum install -y epel-release \
&& yum clean all \
&& rm -rf /var/cache/yum
-RUN mysql_install_db \
+RUN mysql_install_db --force \
&& chown -R mysql:mysql /var/lib/mysql/ \
&& sed -i 's/^\(bind-address\s.*\)/# \1/' /etc/my.cnf \
&& sed -i 's/^\(log_error\s.*\)/# \1/' /etc/my.cnf \
From bcfb7e3727dc33d79ae3f274d18b23845d9a7099 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 1 Oct 2019 16:49:40 -0400
Subject: [PATCH 152/176] 2.4.0-a74-u45-w8-p11-20191001-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 809bbbe5..edb46202 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a74-u44-w8-p11-20190929-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_44,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a74-u45-w8-p11-20191001-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_45,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 5e9523c29d682653312009e33aed87f0eabe013d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 24 Oct 2019 09:01:57 -0600
Subject: [PATCH 153/176] 2.4.0-a77-u49-w10-p11-20191024-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index edb46202..ed2f2aaf 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a74-u45-w8-p11-20191001-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_74,grouper_v2_4_0_ui_patch_45,grouper_v2_4_0_ws_patch_8,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a77-u49-w10-p11-20191024-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_77,grouper_v2_4_0_ui_patch_49,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 5e8e64ec215db06fc235b3c42311dbb6f66fa40c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 28 Oct 2019 07:56:06 -0400
Subject: [PATCH 154/176] 2.4.0-a78-u51-w10-p11-20191028-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index ed2f2aaf..138d653f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a77-u49-w10-p11-20191024-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_77,grouper_v2_4_0_ui_patch_49,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a78-u51-w10-p11-20191028-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_78,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 1190b34d451067a6d43a8f0def26669c142efc7d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 30 Oct 2019 15:10:24 -0400
Subject: [PATCH 155/176] 2.4.0-a79-u51-w10-p11-20191030-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 138d653f..17955d17 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a78-u51-w10-p11-20191028-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_78,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a79-u51-w10-p11-20191030-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_79,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 33db44d2c2a41f2c5462f0d24dfc14b1b183dcc9 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 31 Oct 2019 14:46:27 -0400
Subject: [PATCH 156/176] 2.4.0-80-u51-w10-p11-20191031-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 17955d17..8e0300e0 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a79-u51-w10-p11-20191030-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_79,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-80-u51-w10-p11-20191031-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_80,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 1ba4216468753af1bce8553b87f84f097d7a6ae3 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 9 Dec 2019 13:47:15 -0600
Subject: [PATCH 157/176] Update README.md
---
README.md | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d4b9069e..0d21538c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)
+This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are avalailable at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
+
+The test-compose directory contains an example Grouper environment that starts up the various Grouper components. This example demonstrates how one might go about customizing and deploying their Grouper containers, using the TIER Grouper image as a base image. If evaluating Grouper, this is a good place to start.
+
# Upgrading from 2.3 to 2.4
@@ -11,10 +15,12 @@ In particular, in subject.properties, *.param.base.value should be adjusted to o
Additional upgrade information can be found at the following URL: https://spaces.at.internet2.edu/display/Grouper/v2.4+Upgrade+Instructions+from+v2.3
+
+
# Supported tags
- latest
-- patch specific tags* (i.e. 2.3.0-a97-u41-w11-p16)
+- patch specific tags with date timestamp* (i.e. 2.4.0-80-u51-w10-p11-20191118)
\* Patch builds are routinely produced, but not necessarily for each patch release. The following monikers are used to construct the tag name:
@@ -22,6 +28,7 @@ Additional upgrade information can be found at the following URL: https://spaces
- u = ui patch number
- w = ws patch number
- p = pspng patch number
+- last field = the year, month and day the image was built
# Quick reference
From 2e59eb4aae6f9be679337ac910901f010b008f4c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 9 Dec 2019 13:48:13 -0600
Subject: [PATCH 158/176] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 0d21538c..1707123c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a29-u14-w3-p2-20190217)
+[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
-This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are avalailable at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
+This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
The test-compose directory contains an example Grouper environment that starts up the various Grouper components. This example demonstrates how one might go about customizing and deploying their Grouper containers, using the TIER Grouper image as a base image. If evaluating Grouper, this is a good place to start.
From f4b81f69634d61c01459c20606e2d93f5564db76 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 23 Dec 2019 08:46:46 -0500
Subject: [PATCH 159/176] 2.4.0-a85-u53-w10-p12-20191223-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 8e0300e0..f0ba8c39 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-80-u51-w10-p11-20191031-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_80,grouper_v2_4_0_ui_patch_51,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_11
+# 2.4.0-a85-u53-w10-p12-20191223-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_85,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 3509ca460b2f3223e3b7993050cb94d304977af1 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 24 Dec 2019 07:15:31 -0500
Subject: [PATCH 160/176] 2.4.0-a86-u53-w10-p12-20191224-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index f0ba8c39..6efa4ed3 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a85-u53-w10-p12-20191223-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_85,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a86-u53-w10-p12-20191224-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_86,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 3058d5fcd524b84fb572d081892a334d1955457e Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 2 Jan 2020 19:35:03 -0500
Subject: [PATCH 161/176] 2.4.0-a87-u53-w10-p12-20200102-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 6efa4ed3..322ceff3 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a86-u53-w10-p12-20191224-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_86,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a87-u53-w10-p12-20200102-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 7b7a12a3472682a03b2fcd56acae69d007a058ab Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 2 Jan 2020 21:37:47 -0500
Subject: [PATCH 162/176] 2.4.0-a87-u54-w10-p12-20200102-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 322ceff3..b49f46e2 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a87-u53-w10-p12-20200102-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_53,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a87-u54-w10-p12-20200102-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_54,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From a2a1cac94180d61bdebf85cae0a9b9014132579d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 3 Jan 2020 13:30:57 -0500
Subject: [PATCH 163/176] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1707123c..2862d7c4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
+[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/latest)
This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
From 3e8bd5c7518deebf05c5e63a4f10a122b33e9783 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 3 Jan 2020 13:58:19 -0500
Subject: [PATCH 164/176] typo in jenkins url
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2862d7c4..126d8942 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/latest)
+[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/master)
This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
From e6bd8854a19e7d4a7240bbed67dc84acde861619 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:16:31 -0500
Subject: [PATCH 165/176] 2.4.0-a88-u55-w11-p12-20200109-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index b49f46e2..f081b8c4 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a87-u54-w10-p12-20200102-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_87,grouper_v2_4_0_ui_patch_54,grouper_v2_4_0_ws_patch_10,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a88-u55-w11-p12-20200109-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_88,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From ce4b1d43898ca7d2469b3e1ecc987f804cd8f115 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:17:02 -0500
Subject: [PATCH 166/176] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1707123c..84567891 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-80-u51-w10-p11-20191118)
+[](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/grouper/2.4.0-a88-u55-w11-p12-20200109-rc1)
This repository contains the source code used to create the InCommon Trusted Access Platform Grouper container. This standalone container is pushed to Dockerhub, various tags are available at the following URL: https://hub.docker.com/r/tier/grouper/tags. This repo can also be cloned and the container built locally.
From 82b97ac2449ca7ea4d5c261e112cc3cccd997007 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:46:47 -0500
Subject: [PATCH 167/176] temporary morphString.properties file for build
---
container_files/morphString.properties | 1 +
1 file changed, 1 insertion(+)
create mode 100644 container_files/morphString.properties
diff --git a/container_files/morphString.properties b/container_files/morphString.properties
new file mode 100644
index 00000000..7c1cc4ca
--- /dev/null
+++ b/container_files/morphString.properties
@@ -0,0 +1 @@
+fh43IRJ4Nf5
From 22847a5a3a259b25c6814fbc159b61698de77bd5 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 14:47:38 -0500
Subject: [PATCH 168/176] install temporary morphString.properties
---
Dockerfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Dockerfile b/Dockerfile
index 87435e24..601828c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,8 @@ RUN echo 'Downloading Grouper Installer...' \
&& wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar
COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
+COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION
+
RUN echo 'Installing Grouper'; \
PATH=$PATH:$JAVA_HOME/bin; \
From 9788217fa8b8eee4d286878c16f90df173b731a4 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Thu, 9 Jan 2020 15:00:46 -0500
Subject: [PATCH 169/176] Update Dockerfile
---
Dockerfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Dockerfile b/Dockerfile
index 601828c8..12116253 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,7 @@ RUN echo 'Downloading Grouper Installer...' \
&& wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar http://software.internet2.edu/grouper/release/$GROUPER_VERSION/grouperInstaller.jar
COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
+# Temporary morphString file used for building, not used in production
COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION
From bf865a59134eeaa807fb1063a182bdf7fe814425 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 10 Jan 2020 09:20:08 -0500
Subject: [PATCH 170/176] update dummy encrypt.key
---
container_files/morphString.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/container_files/morphString.properties b/container_files/morphString.properties
index 7c1cc4ca..52479216 100644
--- a/container_files/morphString.properties
+++ b/container_files/morphString.properties
@@ -1 +1 @@
-fh43IRJ4Nf5
+encrypt.key=fh43IRJ4Nf5
From 70d9ca6bedac287392ac46f9bce30de149ccbe0f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 10 Jan 2020 13:36:22 -0500
Subject: [PATCH 171/176] 2.4.0-a89-u55-w11-p12-20200110-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index f081b8c4..11fcfef9 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a88-u55-w11-p12-20200109-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_88,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a89-u55-w11-p12-20200110-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_89,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 332ddf1496bbb9651595609d148211bafd1e37c2 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 31 Jan 2020 12:39:40 -0500
Subject: [PATCH 172/176] 2.4.0-a89-u55-w11-p12-20200131-rc1
remove extraneous grouper.properties in /opt/grouper/grouper.apiBinary/
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 12116253..a397ab04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,7 +75,7 @@ ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/lo
ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
RUN cd /opt/grouper/grouper.apiBinary/; \
- rm -fr ddlScripts/ grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/
+ rm -fr ddlScripts/ grouper.properties grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/
RUN cd /opt/tomcat/; \
chmod +r bin/log4j-*.jar; \
From 9c045d439169867e07fc98336e01226ed4f2da32 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 31 Jan 2020 12:54:58 -0500
Subject: [PATCH 173/176] central.maven.org to repo1 for now
---
Dockerfile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a397ab04..6fdf32bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,13 +66,13 @@ COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomcat-$TOMCAT_VERSI
COPY --from=installing /opt/grouper/$GROUPER_VERSION/apache-tomee-webprofile-$TOMEE_VERSION/ /opt/tomee/
COPY --from=installing /etc/alternatives/java /etc/alternatives/java
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomcat/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomcat/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomcat/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomcat/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
-ADD http://central.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
+ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
RUN cd /opt/grouper/grouper.apiBinary/; \
rm -fr ddlScripts/ grouper.properties grouper.lck grouper.log grouper.script grouper.tmp/ gshAddGrouperSystemWsGroup.gsh logs/
From ac86dac0ea3fc331145befda8e6e7543b552f554 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 5 Feb 2020 16:13:56 -0500
Subject: [PATCH 174/176] 2.4.0-a90-u56-w11-p12-20200205-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 11fcfef9..2a917dc1 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a89-u55-w11-p12-20200110-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_89,grouper_v2_4_0_ui_patch_55,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a90-u56-w11-p12-20200205-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_90,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 3fc57112861802f3e777acc41a6b4fc57ce02e32 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 10 Feb 2020 10:21:07 -0500
Subject: [PATCH 175/176] 2.4.0-a91-u56-w11-p12-20200210-rc1
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index 2a917dc1..c63c9d5f 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a90-u56-w11-p12-20200205-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_90,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a91-u56-w11-p12-20200210-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_91,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set
From 6f931f09ccf4758cacbb544211c991ce65f77f7f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 14 Feb 2020 09:27:31 -0500
Subject: [PATCH 176/176] Update grouper.installer.properties
---
container_files/grouper.installer.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/grouper.installer.properties b/container_files/grouper.installer.properties
index c63c9d5f..4e018728 100644
--- a/container_files/grouper.installer.properties
+++ b/container_files/grouper.installer.properties
@@ -17,8 +17,8 @@ grouperInstaller.default.installOrUpgrade = install
grouperInstaller.autorun.forceInstallPatch = t
grouperInstaller.autorun.installAllPatches = false
grouperInstaller.autorun.installPatchesUpToACertainPatchLevel = true
-# 2.4.0-a91-u56-w11-p12-20200210-rc1
-grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_91,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
+# 2.4.0-a93-u56-w11-p12-20200214-rc1
+grouperInstaller.autorun.installPatchesUpToThesePatchLevels = grouper_v2_4_0_api_patch_93,grouper_v2_4_0_ui_patch_56,grouper_v2_4_0_ws_patch_11,grouper_v2_4_0_pspng_patch_12
#### set this to true to try to use defaults for everything. Only things without default values will need to be set