From 843de430967c62a4ff0051c6328e20fd243262c8 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Thu, 30 Aug 2018 08:21:01 -0700 Subject: [PATCH] Basic build for 401.2.4-2401.2.9 completed. --- .../container_files/seed-data/bootstrap.gsh | 8 +++--- ex401/ex401.2.5/Dockerfile | 26 +++++++++++++++++++ .../container_files/seed-data/bootstrap.gsh | 10 +++++++ .../container_files/seed-data/sisData.sql | 0 .../container_files/seed-data/users.ldif | 0 ex401/ex401.2.6/Dockerfile | 26 +++++++++++++++++++ .../container_files/seed-data/bootstrap.gsh | 2 ++ .../container_files/seed-data/sisData.sql | 0 .../container_files/seed-data/users.ldif | 0 ex401/ex401.2.7/Dockerfile | 26 +++++++++++++++++++ .../container_files/seed-data/bootstrap.gsh | 3 +++ .../container_files/seed-data/sisData.sql | 0 .../container_files/seed-data/users.ldif | 0 ex401/ex401.2.8/Dockerfile | 26 +++++++++++++++++++ .../container_files/seed-data/bootstrap.gsh | 20 ++++++++++++++ .../container_files/seed-data/sisData.sql | 0 .../container_files/seed-data/users.ldif | 0 ex401/ex401.2.9/Dockerfile | 26 +++++++++++++++++++ .../container_files/seed-data/bootstrap.gsh | 1 + .../container_files/seed-data/sisData.sql | 0 .../container_files/seed-data/users.ldif | 0 ex401/ex401.2.end/Dockerfile | 26 +++++++++++++++++++ .../container_files/seed-data/bootstrap.gsh | 1 + .../container_files/seed-data/sisData.sql | 0 .../container_files/seed-data/users.ldif | 0 manualBuild.sh | 8 +++++- 26 files changed, 204 insertions(+), 5 deletions(-) create mode 100644 ex401/ex401.2.5/Dockerfile create mode 100644 ex401/ex401.2.5/container_files/seed-data/bootstrap.gsh create mode 100644 ex401/ex401.2.5/container_files/seed-data/sisData.sql create mode 100644 ex401/ex401.2.5/container_files/seed-data/users.ldif create mode 100644 ex401/ex401.2.6/Dockerfile create mode 100644 ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh create mode 100644 ex401/ex401.2.6/container_files/seed-data/sisData.sql create mode 100644 ex401/ex401.2.6/container_files/seed-data/users.ldif create mode 100644 ex401/ex401.2.7/Dockerfile create mode 100644 ex401/ex401.2.7/container_files/seed-data/bootstrap.gsh create mode 100644 ex401/ex401.2.7/container_files/seed-data/sisData.sql create mode 100644 ex401/ex401.2.7/container_files/seed-data/users.ldif create mode 100644 ex401/ex401.2.8/Dockerfile create mode 100644 ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh create mode 100644 ex401/ex401.2.8/container_files/seed-data/sisData.sql create mode 100644 ex401/ex401.2.8/container_files/seed-data/users.ldif create mode 100644 ex401/ex401.2.9/Dockerfile create mode 100644 ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh create mode 100644 ex401/ex401.2.9/container_files/seed-data/sisData.sql create mode 100644 ex401/ex401.2.9/container_files/seed-data/users.ldif create mode 100644 ex401/ex401.2.end/Dockerfile create mode 100644 ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh create mode 100644 ex401/ex401.2.end/container_files/seed-data/sisData.sql create mode 100644 ex401/ex401.2.end/container_files/seed-data/users.ldif diff --git a/ex401/ex401.2.2/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.2/container_files/seed-data/bootstrap.gsh index a88aa2a..511d532 100644 --- a/ex401/ex401.2.2/container_files/seed-data/bootstrap.gsh +++ b/ex401/ex401.2.2/container_files/seed-data/bootstrap.gsh @@ -2,11 +2,11 @@ gs = GrouperSession.startRootSession(); addStem("app", "mfa", "mfa"); addGroup("app:mfa", "mfa_enabled", "mfa_enabled"); -addGroup("app:mfa", "mfa_allow", "mfa_allow"); -addGroup("app:mfa", "mfa_deny", "mfa_deny"); -addComposite("app:mfa:mfa_enabled", CompositeType.COMPLEMENT, "app:mfa:mfa_allow", "app:mfa:mfa_deny"); +addGroup("app:mfa", "mfa_enabled_allow", "mfa_enabled_allow"); +addGroup("app:mfa", "mfa_enabled_deny", "mf_enabled_deny"); +addComposite("app:mfa:mfa_enabled", CompositeType.COMPLEMENT, "app:mfa:mfa_enabled_allow", "app:mfa:mfa_enabled_deny"); addStem("app:mfa", "ref", "ref"); addGroup("app:mfa:ref", "pilot", "pilot"); -addMember("app:mfa:mfa_allow", "app:mfa:ref:pilot"); +addMember("app:mfa:mfa_enabled_allow", "app:mfa:ref:pilot"); diff --git a/ex401/ex401.2.5/Dockerfile b/ex401/ex401.2.5/Dockerfile new file mode 100644 index 0000000..89eff1e --- /dev/null +++ b/ex401/ex401.2.5/Dockerfile @@ -0,0 +1,26 @@ +FROM tier/grouper-training-env:ex401.2.4 + +LABEL author="tier-packaging@internet2.edu " \ + Vendor="TIER" \ + ImageType="Grouper Training" \ + ImageName=$imagename \ + ImageOS=centos7 + +ENV USERTOKEN=ex401.2.5 + +COPY container_files/seed-data/ /seed-data/ + +RUN . /usr/local/bin/library.sh \ + && prepConf; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ + (mysqld_safe & ) \ + && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ + cd /opt/grouper/grouper.apiBinary \ + && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \ + && mysql grouper < /seed-data/sisData.sql \ + && bin/gsh /seed-data/bootstrap.gsh \ + && pkill -HUP slapd \ + && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ + pkill -u mysql mysqld \ + && while curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to stop; sleep 1; done diff --git a/ex401/ex401.2.5/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.5/container_files/seed-data/bootstrap.gsh new file mode 100644 index 0000000..47403cd --- /dev/null +++ b/ex401/ex401.2.5/container_files/seed-data/bootstrap.gsh @@ -0,0 +1,10 @@ +gs = GrouperSession.startRootSession(); + +addStem("ref", "dept", "dept"); +addGroup("ref:dept", "its", "its"); + +addGroup("app:mfa:ref", "mfa_bypass", "mfa_bypass"); +addGroup("app:mfa:ref", "athletics", "athletics"); + +addMember("app:mfa:mfa_enabled_deny", "app:mfa:ref:mfa_bypass"); +addMember("app:mfa:mfa_enabled_allow", "app:mfa:ref:athletics"); \ No newline at end of file diff --git a/ex401/ex401.2.5/container_files/seed-data/sisData.sql b/ex401/ex401.2.5/container_files/seed-data/sisData.sql new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.5/container_files/seed-data/users.ldif b/ex401/ex401.2.5/container_files/seed-data/users.ldif new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.6/Dockerfile b/ex401/ex401.2.6/Dockerfile new file mode 100644 index 0000000..68cecd4 --- /dev/null +++ b/ex401/ex401.2.6/Dockerfile @@ -0,0 +1,26 @@ +FROM tier/grouper-training-env:ex401.2.5 + +LABEL author="tier-packaging@internet2.edu " \ + Vendor="TIER" \ + ImageType="Grouper Training" \ + ImageName=$imagename \ + ImageOS=centos7 + +ENV USERTOKEN=ex401.2.6 + +COPY container_files/seed-data/ /seed-data/ + +RUN . /usr/local/bin/library.sh \ + && prepConf; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ + (mysqld_safe & ) \ + && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ + cd /opt/grouper/grouper.apiBinary \ + && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \ + && mysql grouper < /seed-data/sisData.sql \ + && bin/gsh /seed-data/bootstrap.gsh \ + && pkill -HUP slapd \ + && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ + pkill -u mysql mysqld \ + && while curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to stop; sleep 1; done diff --git a/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh new file mode 100644 index 0000000..5d8860c --- /dev/null +++ b/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh @@ -0,0 +1,2 @@ +gs = GrouperSession.startRootSession(); + diff --git a/ex401/ex401.2.6/container_files/seed-data/sisData.sql b/ex401/ex401.2.6/container_files/seed-data/sisData.sql new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.6/container_files/seed-data/users.ldif b/ex401/ex401.2.6/container_files/seed-data/users.ldif new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.7/Dockerfile b/ex401/ex401.2.7/Dockerfile new file mode 100644 index 0000000..29d6f95 --- /dev/null +++ b/ex401/ex401.2.7/Dockerfile @@ -0,0 +1,26 @@ +FROM tier/grouper-training-env:ex401.2.6 + +LABEL author="tier-packaging@internet2.edu " \ + Vendor="TIER" \ + ImageType="Grouper Training" \ + ImageName=$imagename \ + ImageOS=centos7 + +ENV USERTOKEN=ex401.2.7 + +COPY container_files/seed-data/ /seed-data/ + +RUN . /usr/local/bin/library.sh \ + && prepConf; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ + (mysqld_safe & ) \ + && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ + cd /opt/grouper/grouper.apiBinary \ + && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \ + && mysql grouper < /seed-data/sisData.sql \ + && bin/gsh /seed-data/bootstrap.gsh \ + && pkill -HUP slapd \ + && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ + pkill -u mysql mysqld \ + && while curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to stop; sleep 1; done diff --git a/ex401/ex401.2.7/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.7/container_files/seed-data/bootstrap.gsh new file mode 100644 index 0000000..22cf9ce --- /dev/null +++ b/ex401/ex401.2.7/container_files/seed-data/bootstrap.gsh @@ -0,0 +1,3 @@ +gs = GrouperSession.startRootSession(); + +addGroup("app:mfa:ref", "BannerUsersMinusFaculty", "BannerUsersMinusFaculty"); diff --git a/ex401/ex401.2.7/container_files/seed-data/sisData.sql b/ex401/ex401.2.7/container_files/seed-data/sisData.sql new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.7/container_files/seed-data/users.ldif b/ex401/ex401.2.7/container_files/seed-data/users.ldif new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.8/Dockerfile b/ex401/ex401.2.8/Dockerfile new file mode 100644 index 0000000..d2cf844 --- /dev/null +++ b/ex401/ex401.2.8/Dockerfile @@ -0,0 +1,26 @@ +FROM tier/grouper-training-env:ex401.2.7 + +LABEL author="tier-packaging@internet2.edu " \ + Vendor="TIER" \ + ImageType="Grouper Training" \ + ImageName=$imagename \ + ImageOS=centos7 + +ENV USERTOKEN=ex401.2.8 + +COPY container_files/seed-data/ /seed-data/ + +RUN . /usr/local/bin/library.sh \ + && prepConf; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ + (mysqld_safe & ) \ + && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ + cd /opt/grouper/grouper.apiBinary \ + && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \ + && mysql grouper < /seed-data/sisData.sql \ + && bin/gsh /seed-data/bootstrap.gsh \ + && pkill -HUP slapd \ + && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ + pkill -u mysql mysqld \ + && while curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to stop; sleep 1; done diff --git a/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh new file mode 100644 index 0000000..bc439e5 --- /dev/null +++ b/ex401/ex401.2.8/container_files/seed-data/bootstrap.gsh @@ -0,0 +1,20 @@ +gs = GrouperSession.startRootSession(); + +addGroup("app:mfa", "mfa_required", "mfa_required"); +addGroup("app:mfa:ref", "mfa_opt_in", "mfa_opt_in"); +addMember("app:mfa:mfa_enabled_allow", "app:mfa:ref:mfa_opt_in"); + +addGroup("app:mfa:ref", "mfa_opt_in_access", "mfa_opt_in_access"); +addGroup("app:mfa:ref", "mfa_opt_in_access_allow", "mfa_opt_in_access_allow"); +addGroup("app:mfa:ref", "mfa_opt_in_access_deny", "mfa_opt_in_access_deny"); + +addComposite("app:mfa:ref:mfa_opt_in_access", CompositeType.COMPLEMENT, "app:mfa:ref:mfa_opt_in_access_allow", "app:mfa:ref:mfa_opt_in_access_deny"); + +addMember("app:mfa:ref:mfa_opt_in_access_allow", "ref:faculty"); +addMember("app:mfa:ref:mfa_opt_in_access_allow", "ref:staff"); +addMember("app:mfa:ref:mfa_opt_in_access_allow", "ref:student"); + +addMember("app:mfa:ref:mfa_opt_in_access_deny", "app:mfa:mfa_required"); + +grantPriv("app:mfa:ref:mfa_opt_in", "app:mfa:ref:mfa_opt_in_access", AccessPrivilege.OPTIN); +grantPriv("app:mfa:ref:mfa_opt_in", "app:mfa:ref:mfa_opt_in_access", AccessPrivilege.OPTOUT); diff --git a/ex401/ex401.2.8/container_files/seed-data/sisData.sql b/ex401/ex401.2.8/container_files/seed-data/sisData.sql new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.8/container_files/seed-data/users.ldif b/ex401/ex401.2.8/container_files/seed-data/users.ldif new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.9/Dockerfile b/ex401/ex401.2.9/Dockerfile new file mode 100644 index 0000000..46a1622 --- /dev/null +++ b/ex401/ex401.2.9/Dockerfile @@ -0,0 +1,26 @@ +FROM tier/grouper-training-env:ex401.2.8 + +LABEL author="tier-packaging@internet2.edu " \ + Vendor="TIER" \ + ImageType="Grouper Training" \ + ImageName=$imagename \ + ImageOS=centos7 + +ENV USERTOKEN=ex401.2.9 + +COPY container_files/seed-data/ /seed-data/ + +RUN . /usr/local/bin/library.sh \ + && prepConf; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ + (mysqld_safe & ) \ + && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ + cd /opt/grouper/grouper.apiBinary \ + && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \ + && mysql grouper < /seed-data/sisData.sql \ + && bin/gsh /seed-data/bootstrap.gsh \ + && pkill -HUP slapd \ + && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ + pkill -u mysql mysqld \ + && while curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to stop; sleep 1; done diff --git a/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh new file mode 100644 index 0000000..0c07f9d --- /dev/null +++ b/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh @@ -0,0 +1 @@ +gs = GrouperSession.startRootSession(); diff --git a/ex401/ex401.2.9/container_files/seed-data/sisData.sql b/ex401/ex401.2.9/container_files/seed-data/sisData.sql new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.9/container_files/seed-data/users.ldif b/ex401/ex401.2.9/container_files/seed-data/users.ldif new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.end/Dockerfile b/ex401/ex401.2.end/Dockerfile new file mode 100644 index 0000000..006b0c0 --- /dev/null +++ b/ex401/ex401.2.end/Dockerfile @@ -0,0 +1,26 @@ +FROM tier/grouper-training-env:ex401.2.9 + +LABEL author="tier-packaging@internet2.edu " \ + Vendor="TIER" \ + ImageType="Grouper Training" \ + ImageName=$imagename \ + ImageOS=centos7 + +ENV USERTOKEN=ex401.2.end + +COPY container_files/seed-data/ /seed-data/ + +RUN . /usr/local/bin/library.sh \ + && prepConf; \ + (/usr/sbin/slapd -h "ldap:/// ldaps:/// ldapi:///" -u ldap &) \ + && while ! curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to start; sleep 1; done; \ + (mysqld_safe & ) \ + && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 3; done; \ + cd /opt/grouper/grouper.apiBinary \ + && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \ + && mysql grouper < /seed-data/sisData.sql \ + && bin/gsh /seed-data/bootstrap.gsh \ + && pkill -HUP slapd \ + && while curl -s ldap://localhost:389 > /dev/null; do echo waiting for ldap to stop; sleep 1; done; \ + pkill -u mysql mysqld \ + && while curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to stop; sleep 1; done diff --git a/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh new file mode 100644 index 0000000..0c07f9d --- /dev/null +++ b/ex401/ex401.2.end/container_files/seed-data/bootstrap.gsh @@ -0,0 +1 @@ +gs = GrouperSession.startRootSession(); diff --git a/ex401/ex401.2.end/container_files/seed-data/sisData.sql b/ex401/ex401.2.end/container_files/seed-data/sisData.sql new file mode 100644 index 0000000..e69de29 diff --git a/ex401/ex401.2.end/container_files/seed-data/users.ldif b/ex401/ex401.2.end/container_files/seed-data/users.ldif new file mode 100644 index 0000000..e69de29 diff --git a/manualBuild.sh b/manualBuild.sh index 648129c..0a1b3e8 100755 --- a/manualBuild.sh +++ b/manualBuild.sh @@ -10,7 +10,13 @@ docker build --pull --tag=tier/grouper-training-env:base base/ \ && docker build --tag=tier/grouper-training-env:ex401.2.1 ex401/ex401.2.1 \ && docker build --tag=tier/grouper-training-env:ex401.2.2 ex401/ex401.2.2 \ && docker build --tag=tier/grouper-training-env:ex401.2.3 ex401/ex401.2.3 \ -&& docker build --tag=tier/grouper-training-env:ex401.2.4 ex401/ex401.2.4 +&& docker build --tag=tier/grouper-training-env:ex401.2.4 ex401/ex401.2.4 \ +&& docker build --tag=tier/grouper-training-env:ex401.2.5 ex401/ex401.2.5 \ +&& docker build --tag=tier/grouper-training-env:ex401.2.6 ex401/ex401.2.6 \ +&& docker build --tag=tier/grouper-training-env:ex401.2.7 ex401/ex401.2.7 \ +&& docker build --tag=tier/grouper-training-env:ex401.2.8 ex401/ex401.2.8 \ +&& docker build --tag=tier/grouper-training-env:ex401.2.9 ex401/ex401.2.9 \ +&& docker build --tag=tier/grouper-training-env:ex401.2.end ex401/ex401.2.end if [[ "$OSTYPE" == "darwin"* ]]; then say build complete