Skip to content

Commit

Permalink
Version 202010 -> 202102
Browse files Browse the repository at this point in the history
  • Loading branch information
credman committed Jan 13, 2021
1 parent 368b3b6 commit 029d16e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) }

Expand All @@ -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'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ex101/run.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions gte
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion internal/mkstudent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 029d16e

Please sign in to comment.