More adjustments to supports exercises; add container 201.end to cove…

…r all 201.* exercises

base/Dockerfile

@@ -1,7 +1,7 @@
 FROM tier/shib-idp:3.4.3_20190201 as idp
 
 # Grouper version for the entire GTE
-FROM i2incommon/grouper:2.5.54
+FROM i2incommon/grouper:2.5.56
 
 # Disable docker HEALTHCHECK inherited from tier/shib-sp
 HEALTHCHECK NONE

base/container_files/conf/grouper.properties

@@ -44,7 +44,7 @@ grouper.lockoutGroup.name.0 = ref:iam:global_deny
 
 # group name of a require group
 # {valueType: "group", regex: "^grouper\\.requireGroup\\.name\\.\\d+$"}
-grouper.requireGroup.name.0 = ref:iam:active
+#grouper.requireGroup.name.0 = ref:iam:active
 
 # allowed to use this require group.  If not configured, anyone could use
 # {valueType: "group", regex: "^grouper\\.lockoutGroup\\.requireGroup\\.\\d+$"}
@@ -55,11 +55,10 @@ grouper.requireGroup.name.0 = ref:iam:active
 reporting.file.system.path = /tmp
 
 
-# {valueType: "string", regex: "^grouper\\.membership\\.customComposite\\.uiKey\\.\\d+$"}
-grouper.membership.customComposite.uiKey.0 = customCompositeMinusActive
+grouper.membership.customComposite.uiKey.0 = customCompositeAllFacStaff
+grouper.membership.customComposite.compositeType.0 = intersection
+grouper.membership.customComposite.groupName.0 = ref:role:all_facstaff
 
-# {valueType: "string", regex: "^grouper\\.membership\\.customComposite\\.compositeType\\.\\d+$"}
-grouper.membership.customComposite.compositeType.0 = complement
-
-# {valueType: "group", regex: "^grouper\\.membership\\.customComposite\\.groupName\\.\\d+$"}
-grouper.membership.customComposite.groupName.0 = ref:iam:active
+grouper.membership.customComposite.uiKey.1 = customCompositeMinusFacStaff
+grouper.membership.customComposite.compositeType.1 = complement
+grouper.membership.customComposite.groupName.1 = ref:role:all_facstaff

base/container_files/conf/grouperText/grouper.text.en.us.properties

@@ -1,6 +1,4 @@
-# Used in general containers
-customCompositeMinusActive = Entities who are not active at the institution
-
-# Referenced in ex401
+# Used in membership filters
+customCompositeAllFacStaff = Entities who are current faculty or staff
 customCompositeMinusFacStaff = Entities who are not faculty or staff
-customCompositeMinusFacStaffStudent = Entities who are not faculty, staff, or students
+customCompositeMinusActive = Entities who are not active at the institution

ex201/ex201.1.end/Dockerfile

@@ -1,5 +1,5 @@
 ARG VERSION_TAG
-FROM tier/gte:201.1.1-$VERSION_TAG
+FROM tier/gte:101.1.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

ex201/ex201.1.end/container_files/seed-data/bootstrap.gsh

@@ -1,7 +1,23 @@
 gs = GrouperSession.startRootSession();
-delStem("201.1.1")
+
 addRootStem("201.1.end", "201.1.end")
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // ex201.1.1
 // addStem("ref", "student", "student")
 studentGroup = addGroup("ref:student", "students", "students");

ex201/ex201.end/Dockerfile

@@ -0,0 +1,29 @@
+ARG VERSION_TAG
+FROM tier/gte:101.1.1-$VERSION_TAG
+
+LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
+      Vendor="TIER" \
+      ImageType="Grouper Training" \
+      ImageName=$imagename \
+      ImageOS=centos7
+
+ENV USERTOKEN=gte-201.end
+
+COPY container_files/seed-data/ /seed-data/
+
+#  && setupFiles
+RUN . /usr/local/bin/library.sh \
+    && prep_conf && prep_finish; \
+    (/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/grouperWebapp/WEB-INF \
+    && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \
+    && mysql grouper < /seed-data/sisData.sql \
+    && if [ ! -f /usr/local/bin/java ]; then ln -s /usr/lib/jvm/java-1.8.0-amazon-corretto/bin/java /usr/local/bin/java; fi \
+    && sudo --preserve-env=PATH -u tomcat bin/gsh.sh /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