From 3524838548dc457911027aee2a66d0a93c024c6c Mon Sep 17 00:00:00 2001
From: mchyzer <mchyzer@isc.upenn.edu>
Date: Sat, 2 Mar 2024 01:46:34 -0500
Subject: [PATCH] taake out pgadmin and have db port available.  fix grouper
 session

---
 base/container_files/var-www-html/index.html          | 4 ++--
 ex201/ex201.end/container_files/grouper/bootstrap.gsh | 2 +-
 ex401/ex401.end/container_files/grouper/bootstrap.gsh | 2 +-
 gte                                                   | 6 ++----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/base/container_files/var-www-html/index.html b/base/container_files/var-www-html/index.html
index b4f3821..d9e5f1d 100644
--- a/base/container_files/var-www-html/index.html
+++ b/base/container_files/var-www-html/index.html
@@ -51,12 +51,12 @@ <h1>GTE jump page</h1>
       <td>Admin: banderson / password<br />
         Civilian: jsmith / password</td>
     </tr>
-    <tr>
+    <!-- tr>
       <td><a href="/pgadmin4/browser/">Database manager</a></td>
       <td>https://localhost:8443/pgadmin4/browser/</td>
       <td>pgAdmin PostgreSQL database manager</td>
       <td>postgres@localhost.localdomain / Example123</td>
-    </tr>
+    </tr -->
     <tr>
       <td><a href="/phpldapadmin/">LDAP manager</a></td>
       <td>https://localhost:8443/phpldapadmin/</td>
diff --git a/ex201/ex201.end/container_files/grouper/bootstrap.gsh b/ex201/ex201.end/container_files/grouper/bootstrap.gsh
index bfdd97c..5cbf969 100644
--- a/ex201/ex201.end/container_files/grouper/bootstrap.gsh
+++ b/ex201/ex201.end/container_files/grouper/bootstrap.gsh
@@ -22,7 +22,7 @@ java.util.Date RECENT_GRAD_END_DATE = cal.time
 
 
 /***** Start of script *****/
-GrouperSession gs = GrouperSession.start(SubjectFinder.findByIdentifierAndSource("banderson", "eduLDAP", true))
+GrouperSession gs = GrouperSession.startBySubjectIdentifierAndSource("banderson", "eduLDAP")
 
 /* Creating a class for methods helps with gsh from the command line, which can't do functions called from other functions */
 class HelperMethods {
diff --git a/ex401/ex401.end/container_files/grouper/bootstrap.gsh b/ex401/ex401.end/container_files/grouper/bootstrap.gsh
index fd7f7fa..525c82f 100644
--- a/ex401/ex401.end/container_files/grouper/bootstrap.gsh
+++ b/ex401/ex401.end/container_files/grouper/bootstrap.gsh
@@ -11,7 +11,7 @@ import edu.internet2.middleware.grouper.grouperUi.beans.ui.GroupStemTemplateCont
 import java.text.SimpleDateFormat;
 
 
-GrouperSession gs = GrouperSession.start(SubjectFinder.findByIdentifierAndSource("banderson", "eduLDAP", true))
+GrouperSession gs = GrouperSession.startBySubjectIdentifierAndSource("banderson", "eduLDAP")
 
 /* Creating a class for methods helps with gsh from the command line, which can't do functions called from other functions */
 class HelperMethods {
diff --git a/gte b/gte
index d0f9676..8dfaf29 100755
--- a/gte
+++ b/gte
@@ -8,8 +8,7 @@ fi
 EXTRA_ARGS=
 
 show_help() {
-  echo "$0 [--sql] [--ldap] [--fg|-it] [docker args ...] <gte lesson id> [container cmd ...]"
-  echo "    --sql:         Expose port 5432"
+  echo "$0 [--ldap] [--fg|-it] [docker args ...] <gte lesson id> [container cmd ...]"
   echo "    --ldap:        Expose port 389"
   echo "    --fg:          Don't detach (i.e., don't run container with -d flag"
   echo "    -h|--help:     This help message"
@@ -19,7 +18,6 @@ show_help() {
 
 for arg in $*; do
   case $arg in
-        --sql) EXTRA_ARGS="$EXTRA_ARGS -p 5432:5432"; shift;;
         --ldap) EXTRA_ARGS="$EXTRA_ARGS -p 389:389"; shift;;
         --fg) is_foreground=1; shift;;
         -it) is_foreground=1; EXTRA_ARGS="$EXTRA_ARGS $1"; shift;;
@@ -65,4 +63,4 @@ fi
 #docker rm "$1" 2> /dev/null
 #docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202403
 echo "Starting container tier/gte:"$LESSON_ID"-$VERSION_TAG"
-docker run -p 8443:443 $EXTRA_ARGS --name $LESSON_ID tier/gte:"$LESSON_ID"-$VERSION_TAG $*
+docker run -p 8443:443 -p 5432:5432 $EXTRA_ARGS --name $LESSON_ID tier/gte:"$LESSON_ID"-$VERSION_TAG $*