From c98b20ef2cc7afa05b370ecf8352bf55b4b60a27 Mon Sep 17 00:00:00 2001
From: Chad Redman <chad_redman@unc.edu>
Date: Thu, 10 Jun 2021 23:45:54 -0400
Subject: [PATCH] Tag 202102 -> 202106
---
Jenkinsfile | 4 ++--
ex101/run.sh | 2 +-
gte | 7 ++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 61be3d1..793b1fb 100644
--- a/Jenkinsfile
+++ b/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'
}
}
}
diff --git a/ex101/run.sh b/ex101/run.sh
index 4b9b904..d7a88a9 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-202102
+docker run -d -p 389:389 -p 8443:443 -p 3306:3306 --name grouper-demo tier/gte:101.1.1-202106
diff --git a/gte b/gte
index 35967e0..97b2194 100755
--- a/gte
+++ b/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 $*