Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Tag 202102 -> 202106
credman committed Jun 11, 2021
1 parent f65cabe commit c98b20e
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
// def tagSet = generateTagSet()
// def builds = build(tagSet)

if(env.BRANCH_NAME == "202102") {
if(env.BRANCH_NAME == "202106") {
//builds.each{ k, v -> echo ("push ${k}") } //for local testing
// builds.each{ k, v -> v.push(k) } <- not used anymore
def build = docker.build("${maintainer}/${imagename}:101.1.1-${tag}", "--no-cache --pull --build-arg VERSION_TAG=${tag} ex101/ex101.1.1")
@@ -272,7 +272,7 @@ pipeline {
*/

} else {
echo 'not building images, since the SCM branch is not 202102'
echo 'not building images, since the SCM branch is not 202106'
}
}
}
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-202102
docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-202106
7 changes: 4 additions & 3 deletions gte
@@ -1,6 +1,7 @@

#! /bin/bash

VERSION_TAG=202102
VERSION_TAG=202106

EXTRA_ARGS=
RABBITMQ_FL=
@@ -43,7 +44,7 @@ if [ -z "$1" ]
my_array=( $( docker images | grep "tier/gte.*$VERSION_TAG" | grep -v base | awk '{print $2}' | sort ) )
for i in "${my_array[@]}"
do
# strip last 7 chars (-202102)
# strip last 7 chars (-202106)
i=${i::${#i}-7}
echo $i
done
@@ -75,6 +76,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"-202102
#docker run -d -p 8443:443 --link rabbitmq:rabbitmq --name $1 tier/gte:"$1"-202106
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 $*

0 comments on commit c98b20e

Please sign in to comment.