add VERSION_TAG to rest of build

docker · Apr 20, 2019 · dd934df · dd934df
1 parent 1c99a6c
commit dd934df
Showing 33 changed files with 96 additions and 59 deletions.
diff --git a/ex211/ex211.1.1/Dockerfile b/ex211/ex211.1.1/Dockerfile
@@ -1,4 +1,6 @@
-FROM tier/grouper-training-env:base
+ARG VERSION_TAG
+FROM tier/gte:base-$VERSION_TAG
+
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex211/manualBuild.sh b/ex211/manualBuild.sh
@@ -1,4 +1,6 @@
-docker build --tag=tier/grouper-training-env:ex211.1.1 ex211.1.1
+source ../buildVersion.sh
+echo "Building gte:211 version ${VERSION_TAG}"
+docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:211.1.1-${VERSION_TAG} ex211.1.1
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   say exercises for 211 build complete

diff --git a/ex301/ex301.4.1/Dockerfile b/ex301/ex301.4.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:base
+ARG VERSION_TAG
+FROM tier/gte:base-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex301/manualBuild.sh b/ex301/manualBuild.sh
@@ -1,4 +1,6 @@
-docker build --tag=tier/grouper-training-env:ex301.4.1 ex301.4.1
+source ../buildVersion.sh
+echo "Building gte:301 version ${VERSION_TAG}"
+docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:301.4.1-${VERSION_TAG} ex301.4.1
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   say exercises for 301 build complete

diff --git a/ex401/ex401.1.1/Dockerfile b/ex401/ex401.1.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:base
+ARG VERSION_TAG
+FROM tier/gte:base-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.1.2/Dockerfile b/ex401/ex401.1.2/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.1
+ARG VERSION_TAG
+FROM tier/gte:401.1.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.1.3/Dockerfile b/ex401/ex401.1.3/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.2
+ARG VERSION_TAG
+FROM tier/gte:401.1.2-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.1.4/Dockerfile b/ex401/ex401.1.4/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.3
+ARG VERSION_TAG
+FROM tier/gte:401.1.3-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.1.5/Dockerfile b/ex401/ex401.1.5/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.4
+ARG VERSION_TAG
+FROM tier/gte:401.1.4-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.1.6/Dockerfile b/ex401/ex401.1.6/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.5
+ARG VERSION_TAG
+FROM tier/gte:401.1.5-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.1.end/Dockerfile b/ex401/ex401.1.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.6
+ARG VERSION_TAG
+FROM tier/gte:401.1.6-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.1/Dockerfile b/ex401/ex401.2.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.1.end
+ARG VERSION_TAG
+FROM tier/gte:401.1.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.2/Dockerfile b/ex401/ex401.2.2/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.1
+ARG VERSION_TAG
+FROM tier/gte:401.2.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.3/Dockerfile b/ex401/ex401.2.3/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.2
+ARG VERSION_TAG
+FROM tier/gte:401.2.2-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.4/Dockerfile b/ex401/ex401.2.4/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.3
+ARG VERSION_TAG
+FROM tier/gte:401.2.3-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.5/Dockerfile b/ex401/ex401.2.5/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.4
+ARG VERSION_TAG
+FROM tier/gte:401.2.4-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.6/Dockerfile b/ex401/ex401.2.6/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.5
+ARG VERSION_TAG
+FROM tier/gte:401.2.5-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.7/Dockerfile b/ex401/ex401.2.7/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.6
+ARG VERSION_TAG
+FROM tier/gte:401.2.6-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.8/Dockerfile b/ex401/ex401.2.8/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.7
+ARG VERSION_TAG
+FROM tier/gte:401.2.7-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.9/Dockerfile b/ex401/ex401.2.9/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.8
+ARG VERSION_TAG
+FROM tier/gte:401.2.8-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.2.end/Dockerfile b/ex401/ex401.2.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.9
+ARG VERSION_TAG
+FROM tier/gte:401.2.9-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.1/Dockerfile b/ex401/ex401.3.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.2.end
+ARG VERSION_TAG
+FROM tier/gte:401.2.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.2/Dockerfile b/ex401/ex401.3.2/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.1
+ARG VERSION_TAG
+FROM tier/gte:401.3.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.3/Dockerfile b/ex401/ex401.3.3/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.2
+ARG VERSION_TAG
+FROM tier/gte:401.3.2-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.4/Dockerfile b/ex401/ex401.3.4/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.3
+ARG VERSION_TAG
+FROM tier/gte:401.3.3-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.5/Dockerfile b/ex401/ex401.3.5/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.4
+ARG VERSION_TAG
+FROM tier/gte:401.3.4-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.6/Dockerfile b/ex401/ex401.3.6/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.5
+ARG VERSION_TAG
+FROM tier/gte:401.3.5-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.7/Dockerfile b/ex401/ex401.3.7/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.6
+ARG VERSION_TAG
+FROM tier/gte:401.3.6-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.3.end/Dockerfile b/ex401/ex401.3.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.7
+ARG VERSION_TAG
+FROM tier/gte:401.3.7-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.4.1/Dockerfile b/ex401/ex401.4.1/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.3.end
+ARG VERSION_TAG
+FROM tier/gte:401.3.end-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/ex401.4.end/Dockerfile b/ex401/ex401.4.end/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:ex401.4.1
+ARG VERSION_TAG
+FROM tier/gte:401.4.1-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git a/ex401/manualBuild.sh b/ex401/manualBuild.sh
@@ -1,30 +1,32 @@
-docker build --tag=tier/grouper-training-env:ex401.1.1 ex401.1.1 \
-&& docker build --tag=tier/grouper-training-env:ex401.1.2 ex401.1.2 \
-&& docker build --tag=tier/grouper-training-env:ex401.1.3 ex401.1.3 \
-&& docker build --tag=tier/grouper-training-env:ex401.1.4 ex401.1.4 \
-&& docker build --tag=tier/grouper-training-env:ex401.1.5 ex401.1.5 \
-&& docker build --tag=tier/grouper-training-env:ex401.1.6 ex401.1.6 \
-&& docker build --tag=tier/grouper-training-env:ex401.1.end ex401.1.end \
-&& docker build --tag=tier/grouper-training-env:ex401.2.1 ex401.2.1 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.2 ex401.2.2 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.3 ex401.2.3 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.4 ex401.2.4 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.5 ex401.2.5 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.6 ex401.2.6 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.7 ex401.2.7 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.8 ex401.2.8 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.9 ex401.2.9 \
-&& docker build --tag=tier/grouper-training-env:ex401.2.end ex401.2.end \
-&& docker build --tag=tier/grouper-training-env:ex401.3.1 ex401.3.1 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.2 ex401.3.2 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.3 ex401.3.3 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.4 ex401.3.4 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.5 ex401.3.5 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.6 ex401.3.6 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.7 ex401.3.7 \
-&& docker build --tag=tier/grouper-training-env:ex401.3.end ex401.3.end \
-&& docker build --tag=tier/grouper-training-env:ex401.4.1 ex401.4.1 \
-&& docker build --tag=tier/grouper-training-env:ex401.4.end ex401.4.end
+source ../buildVersion.sh
+echo "Building gte:401 version ${VERSION_TAG}"
+docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.1-${VERSION_TAG} ex401.1.1 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.2-${VERSION_TAG} ex401.1.2 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.3-${VERSION_TAG} ex401.1.3 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.4-${VERSION_TAG} ex401.1.4 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.5-${VERSION_TAG} ex401.1.5 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.6-${VERSION_TAG} ex401.1.6 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.1.end-${VERSION_TAG} ex401.1.end \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.1-${VERSION_TAG} ex401.2.1 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.2-${VERSION_TAG} ex401.2.2 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.3-${VERSION_TAG} ex401.2.3 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.4-${VERSION_TAG} ex401.2.4 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.5-${VERSION_TAG} ex401.2.5 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.6-${VERSION_TAG} ex401.2.6 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.7-${VERSION_TAG} ex401.2.7 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.8-${VERSION_TAG} ex401.2.8 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.9-${VERSION_TAG} ex401.2.9 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.2.end-${VERSION_TAG} ex401.2.end \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.1-${VERSION_TAG} ex401.3.1 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.2-${VERSION_TAG} ex401.3.2 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.3-${VERSION_TAG} ex401.3.3 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.4-${VERSION_TAG} ex401.3.4 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.5-${VERSION_TAG} ex401.3.5 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.6-${VERSION_TAG} ex401.3.6 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.7-${VERSION_TAG} ex401.3.7 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.3.end-${VERSION_TAG} ex401.3.end \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.4.1-${VERSION_TAG} ex401.4.1 \
+&& docker build --build-arg VERSION_TAG=${VERSION_TAG} --tag=tier/gte:401.4.end-${VERSION_TAG} ex401.4.end
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   say exercises for 401 build complete

diff --git a/full-demo/Dockerfile b/full-demo/Dockerfile
@@ -1,4 +1,5 @@
-FROM tier/grouper-training-env:base
+ARG VERSION_TAG
+FROM tier/gte:base-$VERSION_TAG
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \