Rebuilt user population with an additional id; Added a working demo i…

…mage

README.md

@@ -1,2 +1,27 @@
 # grouper_training
 A set of Grouper images that are used during I2/TIER training.
+
+# Images
+
+## Full Demo
+
+```
+docker run -d -p 80:80 -p 443:443 -p 4443:4443 -p 3306:3306 \
+  --name grouper-demo tier/grouper_training_full_demo:latest
+```
+
+Browse to `https://localhost/grouper`
+
+## Exercises
+
+```
+docker run -d -p 80:80 -p 443:443 -p 4443:4443 -p 3306:3306 \
+  --name grouper-demo tier/grouper_training_full_ex###:latest
+```
+
+Browse to `https://localhost/grouper`
+
+# Users
+- `banderson`/`password`: Grouper Administrator
+- `jsmith`/`password`: standard user
+- additional users can be found in <https://github.internet2.edu/docker/grouper_training/blob/master/base/container_files/seed-data/users.ldif#L56>

base/Dockerfile

@@ -82,6 +82,6 @@ RUN cp /opt/tier-support/grouper.xml /opt/tier-support/grouper-ws.xml /opt/tomca
     && chown -R tomcat /opt/shibboleth-idp/ \
     && chmod -R 700 /opt/shibboleth-idp/
 
-EXPOSE 389 3306
+EXPOSE 389 3306 4443
 
 CMD LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH && exec /usr/bin/supervisord -c /opt/tier-support/supervisord-training.conf

base/container_files/conf/subject.properties

@@ -61,7 +61,7 @@ subjectApi.source.ldap.search.searchSubject.param.base.value = ou=people,dc=inte
 #  identifies the user, e.g. jsmith or jsmith@institution.edu.
 #  Subjects can have multiple identifiers.  Note: it is nice to have if identifiers are unique
 #  even across sources.  Returns one result when searching for one identifier.
-subjectApi.source.ldap.search.searchSubjectByIdentifier.param.filter.value = (&(uid=%TERM%)(objectclass=person))
+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
 
@@ -71,5 +71,4 @@ subjectApi.source.ldap.search.search.param.filter.value = (&(|(|(uid=%TERM%)(cn=
 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.attributes = givenName, sn, uid, mail
 subjectApi.source.ldap.internalAttributes = searchAttribute0