diff --git a/Jenkinsfile b/Jenkinsfile index a04d920..8058184 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ * EXERCISE_FOLDERS has the image name and corresponding build folder **/ -TARGET_BRANCH = '202408' +TARGET_BRANCH = '202411' EXERCISE_FOLDERS = [ "base": "base", diff --git a/base/Dockerfile b/base/Dockerfile index 8d7bcca..7d9d9a1 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -12,8 +12,8 @@ LABEL author="tier-packaging@internet2.edu " \ Vendor="Internet2" \ ImageType="Grouper" \ ImageName="Grouper Training" \ - Version="202408" \ - ImageOS=rocky8 + Version="202411" \ + ImageOS=rocky9 ENV ENV=training \ USERTOKEN=gte-base diff --git a/gte b/gte index 63d3707..f33e21f 100755 --- a/gte +++ b/gte @@ -2,7 +2,7 @@ REPOSITORY=tier/gte if [ -z "$VERSION_TAG" ]; then - VERSION_TAG=202408 + VERSION_TAG=202411 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"-202408 +#docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202411 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 e405354..d3d788c 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/202408/internal/userdata.sh +user data script from https://github.internet2.edu/docker/grouper_training/raw/202411/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 8a8385e..35699be 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=202408 +export GROUPER_GTE_DOCKER_BRANCH=202411 echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt chmod a+r /root/grouperGteBranch.txt