Grouper 2.6.15.1 -> 2.6.16.2; remove symlink /usr/local/bin/java, sin…

…ce the Grouper entrypoint sets owner to tomcat which causes issues

base/Dockerfile

@@ -2,7 +2,7 @@ FROM tier/shib-idp:3.4.7_20200702 as idp
 # latest 3.x is tier/shib-idp:3.4.7_20200702
 
 # Grouper version for the entire GTE
-FROM i2incommon/grouper:2.6.15.1
+FROM i2incommon/grouper:2.6.16.2
 
 # Disable docker HEALTHCHECK inherited from tier/shib-sp
 HEALTHCHECK NONE

ex101/ex101.1.1/Dockerfile

@@ -26,7 +26,6 @@ RUN . /usr/local/bin/library.sh \
     && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \
     && mysql grouper < /seed-data/sisData.sql \
     && cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ \
-    && 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 ./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; \

ex201/ex201.end/Dockerfile

@@ -24,7 +24,6 @@ RUN . /usr/local/bin/library.sh \
     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; \

ex401/ex401.end/Dockerfile

@@ -25,7 +25,6 @@ RUN . /usr/local/bin/library.sh \
     && ldapadd -x -D cn=root,dc=internet2,dc=edu -w password -f /seed-data/users.ldif \
     && mysql grouper < /seed-data/sisData.sql \
     && cp -r /opt/grouper/grouperWebapp/WEB-INF/libUiAndDaemon/* /opt/grouper/grouperWebapp/WEB-INF/lib/ \
-    && 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; \