From 59f9aed82c7e2d239d5db21f551b13e362374625 Mon Sep 17 00:00:00 2001
From: Chad Redman <credman@unicon.net>
Date: Sun, 4 Aug 2024 15:16:38 -0400
Subject: [PATCH] Increment image branch for 202408

---
 Jenkinsfile            | 2 +-
 base/Dockerfile        | 2 +-
 gte                    | 4 ++--
 internal/createNew.txt | 2 +-
 internal/mkstudent.sh  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 250b24c..a04d920 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@
  *  EXERCISE_FOLDERS has the image name and corresponding build folder
 **/
 
-TARGET_BRANCH = '202403'
+TARGET_BRANCH = '202408'
 
 EXERCISE_FOLDERS = [
     "base":       "base",
diff --git a/base/Dockerfile b/base/Dockerfile
index 4de5a52..6c98767 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -12,7 +12,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="Internet2" \
       ImageType="Grouper" \
       ImageName="Grouper Training" \
-      Version="202403" \
+      Version="202408" \
       ImageOS=rocky8
 
 ENV ENV=training \
diff --git a/gte b/gte
index 8dfaf29..63d3707 100755
--- a/gte
+++ b/gte
@@ -2,7 +2,7 @@
 
 REPOSITORY=tier/gte
 if [ -z "$VERSION_TAG" ]; then
-  VERSION_TAG=202403
+  VERSION_TAG=202408
 fi
 
 EXTRA_ARGS=
@@ -61,6 +61,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"-202403
+#docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202408
 echo "Starting container 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 $*
diff --git a/internal/createNew.txt b/internal/createNew.txt
index be3691f..e405354 100644
--- a/internal/createNew.txt
+++ b/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/202403/internal/userdata.sh
+user data script from https://github.internet2.edu/docker/grouper_training/raw/202408/internal/userdata.sh
 
 ssh -i gte-training-master.pem ec2-user@3.136.154.33
 
diff --git a/internal/mkstudent.sh b/internal/mkstudent.sh
index 918a423..8a8385e 100644
--- a/internal/mkstudent.sh
+++ b/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=202403
+export GROUPER_GTE_DOCKER_BRANCH=202408
 
 echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt
 chmod a+r /root/grouperGteBranch.txt