diff --git a/Jenkinsfile b/Jenkinsfile index 22ea8a1..0c551b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -83,7 +83,7 @@ pipeline { def tagSet = generateTagSet() def builds = build(tagSet) - if(env.BRANCH_NAME == "202010") { + if(env.BRANCH_NAME == "202102") { //builds.each{ k, v -> echo ("push ${k}") } //for local testing builds.each{ k, v -> v.push(k) } @@ -100,7 +100,7 @@ pipeline { build.push("full_demo-${tag}") } else { - echo 'not building images, since the SCM branch is not 202010' + echo 'not building images, since the SCM branch is not 202102' } } } diff --git a/ex101/run.sh b/ex101/run.sh index a3bf90c..4b9b904 100755 --- a/ex101/run.sh +++ b/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-202010 +docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-202102 diff --git a/gte b/gte index f9ae22d..d35e6f2 100755 --- a/gte +++ b/gte @@ -7,7 +7,7 @@ if [ -z "$1" ] my_array=( $( docker images | grep 'tier/gte' | grep -v base | awk '{print $2}' | sort ) ) for i in "${my_array[@]}" do - # strip last 7 chars (-202010) + # strip last 7 chars (-202102) i=${i::${#i}-7} echo $i done @@ -31,5 +31,4 @@ $DIR/start-rabbitmq.sh #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"-202010 - +docker run -d -p 8443:443 --link rabbitmq:rabbitmq --name $1 tier/gte:"$1"-202102 diff --git a/internal/mkstudent.sh b/internal/mkstudent.sh index bf5a763..126822c 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=202010 +export GROUPER_GTE_DOCKER_BRANCH=202102 echo "$GROUPER_GTE_BRANCH" > /root/grouperGteBranch.txt chmod a+r /root/grouperGteBranch.txt