Increment image branch for 202312; Grouper base image 4.8.0

Jenkinsfile

@@ -12,7 +12,7 @@
  *  EXERCISE_FOLDERS has the image name and corresponding build folder
 **/
 
-TARGET_BRANCH = '202310'
+TARGET_BRANCH = '202312'
 
 EXERCISE_FOLDERS = [
     "base":       "base",

base/Dockerfile

@@ -2,16 +2,17 @@ FROM tier/shib-idp:4.3.1_20230818 as idp
 # latest 3.x is tier/shib-idp:3.4.7_20200702
 
 # Grouper version for the entire GTE
-FROM i2incommon/grouper:4.5.5
+FROM i2incommon/grouper:4.8.0
 
 # Disable docker HEALTHCHECK inherited from tier/shib-sp
 HEALTHCHECK NONE
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
-      Vendor="TIER" \
-      ImageType="Grouper Training" \
-      ImageName=$imagename \
-      ImageOS=centos7
+      Vendor="Internet2" \
+      ImageType="Grouper" \
+      ImageName="Grouper Training" \
+      Version="202312" \
+      ImageOS=rocky8
 
 ENV ENV=training \
     USERTOKEN=gte-base

gte

@@ -2,7 +2,7 @@
 
 REPOSITORY=tier/gte
 if [ -z "$VERSION_TAG" ]; then
-  VERSION_TAG=202310
+  VERSION_TAG=202312
 fi
 
 EXTRA_ARGS=
@@ -36,16 +36,15 @@ if [ "$is_foreground" != 1 ]; then
   EXTRA_ARGS="$EXTRA_ARGS -d"
 fi
 
-if [ -z "$1" ]
-  then
-    echo "Pass in which gte environment to spin up:"
-    # Get all container tags for tier/gte:*-2021xx
-    my_array=( $(docker images "$REPOSITORY" --format '{{.Tag}}' | grep -- "-$VERSION_TAG$" | sed -e "s/-$VERSION_TAG$//" | sort ) )
-    for i in "${my_array[@]}"
-    do
-      echo $i
-    done
-    exit 1
+if [ -z "$1" ]; then
+  echo "Pass in which gte environment to spin up:"
+  # Get all container tags for tier/gte:*-2021xx
+  #my_array=( $(docker images "$REPOSITORY" --format '{{.Tag}}' | grep -- "-$VERSION_TAG$" | sed -e "s/-$VERSION_TAG$//" | sort ) )
+  mapfile -t my_array < <(docker images "$REPOSITORY" --format '{{.Tag}}' | grep -- "-$VERSION_TAG$" | sed -e "s/-$VERSION_TAG$//" | sort)
+  for i in "${my_array[@]}"; do
+    echo $i
+  done
+  exit 1
 fi
 
 LESSON_ID=$1
@@ -64,6 +63,6 @@ fi
 
 #docker stop "$1" 2> /dev/null
 #docker rm "$1" 2> /dev/null
-#docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202310
+#docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202312
 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 $*

internal/createNew.txt

@@ -8,7 +8,7 @@ security group: gte-training
 tag env training
 
 
-user data script from https://github.internet2.edu/docker/grouper_training/raw/202310/internal/userdata.sh
+user data script from https://github.internet2.edu/docker/grouper_training/raw/202312/internal/userdata.sh
 
 ssh -i gte-training-master.pem ec2-user@3.136.154.33
 

internal/mkstudent.sh

@@ -2,7 +2,7 @@
 
 export GROUPER_GTE_BRANCH=GROUPER_BUILD_CLOUD_FORMATION
 #export GROUPER_GTE_DOCKER_BRANCH=GROUPER_BUILD_CLOUD_FORMATION
-export GROUPER_GTE_DOCKER_BRANCH=202310
+export GROUPER_GTE_DOCKER_BRANCH=202312
 
 echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt
 chmod a+r /root/grouperGteBranch.txt