diff --git a/Jenkinsfile b/Jenkinsfile index ff0289a..7538655 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ * EXERCISE_FOLDERS has the image name and corresponding build folder **/ -TARGET_BRANCH = '202411' +TARGET_BRANCH = '202503-pre' EXERCISE_FOLDERS = [ "base": "base", diff --git a/TODO.md b/TODO.md index 267f98e..288e9d6 100644 --- a/TODO.md +++ b/TODO.md @@ -1,6 +1,10 @@ TODO ===== +202502 +------ +- LDAP add posix object classes (nis.schema) for better examples + 202403 ------ diff --git a/base/Dockerfile b/base/Dockerfile index ffcf554..8820194 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -3,7 +3,7 @@ FROM i2incommon/shib-idp:4.3.3_20240715_rocky8_multiarch AS idp #FROM i2incommon/grouper:4.10.2 as grouper4 # Grouper version for the entire GTE -FROM i2incommon/grouper:5.13.5 +FROM i2incommon/grouper:5.16.0 # Disable docker HEALTHCHECK inherited from tier/shib-sp HEALTHCHECK NONE @@ -12,7 +12,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \ Vendor="Internet2" \ ImageType="Grouper" \ ImageName="Grouper Training" \ - Version="202411" \ + Version="202503-pre" \ ImageOS=rocky9 ENV ENV=training \ diff --git a/gte b/gte index f33e21f..3015e75 100755 --- a/gte +++ b/gte @@ -2,7 +2,7 @@ REPOSITORY=tier/gte if [ -z "$VERSION_TAG" ]; then - VERSION_TAG=202411 + VERSION_TAG=202503-pre 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"-202411 +#docker run -d -p 8443:443 --name $1 tier/gte:"$1"-202503-pre 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 d3d788c..129585b 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/202411/internal/userdata.sh +user data script from https://github.internet2.edu/docker/grouper_training/raw/202503-pre/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 35699be..3a18d8c 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=202411 +export GROUPER_GTE_DOCKER_BRANCH=202503-pre echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt chmod a+r /root/grouperGteBranch.txt