Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
New branch 202202
credman committed Jan 15, 2022
1 parent c3ed4ab commit 090c7eb
Showing 7 changed files with 53 additions and 242 deletions.
274 changes: 38 additions & 236 deletions Jenkinsfile

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions TODO.md
@@ -0,0 +1,9 @@
TODO
=====


202202
-------

- Upgrade Shibboleth IDP to latest 4.1.4 (low priority)
- Remove folders for unused images; in Sept. 2021 we were fine with 101.1, 201.end and 401.end
2 changes: 1 addition & 1 deletion base/Dockerfile
@@ -1,7 +1,7 @@
FROM tier/shib-idp:3.4.3_20190201 as idp

# Grouper version for the entire GTE
FROM i2incommon/grouper:2.6.0
FROM i2incommon/grouper:2.6.5

# Disable docker HEALTHCHECK inherited from tier/shib-sp
HEALTHCHECK NONE
2 changes: 1 addition & 1 deletion ex101/run.sh
@@ -1 +1 @@
docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-202109
docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-202202
4 changes: 2 additions & 2 deletions gte
@@ -1,7 +1,7 @@
#! /bin/bash

REPOSITORY=tier/gte
VERSION_TAG=202109
VERSION_TAG=202202

EXTRA_ARGS=
RABBITMQ_FL=
@@ -75,6 +75,6 @@ fi

#docker stop "$1" 2> /dev/null
#docker rm "$1" 2> /dev/null
#docker run -d -p 8443:443 --link rabbitmq:rabbitmq --name $1 tier/gte:"$1"-202106
#docker run -d -p 8443:443 --link rabbitmq:rabbitmq --name $1 tier/gte:"$1"-202202
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 $*
2 changes: 1 addition & 1 deletion 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/202106/internal/userdata.sh
user data script from https://github.internet2.edu/docker/grouper_training/raw/202202/internal/userdata.sh

ssh -i gte-training-master.pem ec2-user@3.136.154.33

2 changes: 1 addition & 1 deletion 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=202109
export GROUPER_GTE_DOCKER_BRANCH=202202

echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt
chmod a+r /root/grouperGteBranch.txt

0 comments on commit 090c7eb

Please sign in to comment.