diff --git a/Jenkinsfile b/Jenkinsfile index a47354e..75037c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ * EXERCISE_FOLDERS has the image name and corresponding build folder **/ -TARGET_BRANCH = '202211' +TARGET_BRANCH = '202303' EXERCISE_FOLDERS = [ "base": "base", diff --git a/base/Dockerfile b/base/Dockerfile index 66ad0f0..93410db 100644 --- a/base/Dockerfile +++ b/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.16.2 +FROM i2incommon/grouper:2.6.18.1 # Disable docker HEALTHCHECK inherited from tier/shib-sp HEALTHCHECK NONE diff --git a/gte b/gte index 054020d..7f091ac 100755 --- a/gte +++ b/gte @@ -1,7 +1,7 @@ #! /bin/bash REPOSITORY=tier/gte -VERSION_TAG=202211 +VERSION_TAG=202303 EXTRA_ARGS= @@ -62,6 +62,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"-202211 +#docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202303 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 $* diff --git a/internal/createNew.txt b/internal/createNew.txt index 3107199..0c58b26 100644 --- a/internal/createNew.txt +++ b/internal/createNew.txt @@ -7,7 +7,7 @@ storage 30gig security group: gte-training tag env training -user data script from https://github.internet2.edu/docker/grouper_training/raw/202211/internal/userdata.sh +user data script from https://github.internet2.edu/docker/grouper_training/raw/202303/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 40461bc..e81b0c7 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=202211 +export GROUPER_GTE_DOCKER_BRANCH=202303 echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt chmod a+r /root/grouperGteBranch.txt