From c6577f37c0ba1e38a8729b643ad1062f8e3b3a05 Mon Sep 17 00:00:00 2001
From: John Gasper <jtgasper3@gmail.com>
Date: Thu, 11 Oct 2018 09:05:34 -0700
Subject: [PATCH] Stubbing  ex101.1.1 and ex211.1.1 images

---
 Jenkinsfile                |  8 +++++++-
 README.md                  | 14 +++++++++++++-
 ex101/ex101.1.1/Dockerfile | 11 +++++++++++
 ex101/manualBuild.sh       |  5 +++++
 ex211/ex211.1.1/Dockerfile | 11 +++++++++++
 ex211/manualBuild.sh       |  5 +++++
 ex301/manualBuild.sh       |  2 +-
 manualBuild.sh             |  8 ++++++++
 8 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 ex101/ex101.1.1/Dockerfile
 create mode 100755 ex101/manualBuild.sh
 create mode 100644 ex211/ex211.1.1/Dockerfile
 create mode 100755 ex211/manualBuild.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index c978156..67cd722 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -99,7 +99,13 @@ pipeline {
             steps {
                 script {
                     docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-${maintainer}") {
-                        def baseImg = docker.build("${maintainer}/${imagename}:ex301.4.1", "--no-cache --pull ex301/ex301.4.1")
+                        def baseImg = docker.build("${maintainer}/${imagename}:ex101.1.1", "--no-cache --pull ex101/ex101.1.1")
+                        baseImg.push("ex101.1.1")
+
+                        baseImg = docker.build("${maintainer}/${imagename}:ex211.1.1", "--no-cache --pull ex211/ex211.1.1")
+                        baseImg.push("ex211.1.1")
+
+                        baseImg = docker.build("${maintainer}/${imagename}:ex301.4.1", "--no-cache --pull ex301/ex301.4.1")
                         baseImg.push("ex301.4.1")
                     }
                 }
diff --git a/README.md b/README.md
index b249b3b..be1dfef 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,19 @@ docker run -d -p 80:80 -p 389:389 -p 8443:443 -p 3306:3306 \
 ```
 
 Current tags:
-
+- ex101.1.1
+- ex201.1.1
+- ex201.1.end
+- ex201.2.1
+- ex201.2.end
+- ex201.3.1
+- ex201.3.end
+- ex201.4.1
+- ex201.4.end
+- ex201.5.1
+- ex201.5.end
+- ex211.1.1
+- ex301.4.1
 - ex401.1.1
 - ex401.1.2
 - ex401.1.3
diff --git a/ex101/ex101.1.1/Dockerfile b/ex101/ex101.1.1/Dockerfile
new file mode 100644
index 0000000..6677ebc
--- /dev/null
+++ b/ex101/ex101.1.1/Dockerfile
@@ -0,0 +1,11 @@
+FROM tier/grouper-training-env:base
+
+LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
+      Vendor="TIER" \
+      ImageType="Grouper Training" \
+      ImageName=$imagename \
+      ImageOS=centos7
+
+ENV USERTOKEN=ex101.1.1
+
+# Nothing else needed for this exercise. Start empty and end empty
diff --git a/ex101/manualBuild.sh b/ex101/manualBuild.sh
new file mode 100755
index 0000000..15e7cda
--- /dev/null
+++ b/ex101/manualBuild.sh
@@ -0,0 +1,5 @@
+docker build --tag=tier/grouper-training-env:ex101.1.1 ex101.1.1
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  say exercises for 101 build complete
+fi
diff --git a/ex211/ex211.1.1/Dockerfile b/ex211/ex211.1.1/Dockerfile
new file mode 100644
index 0000000..6472faa
--- /dev/null
+++ b/ex211/ex211.1.1/Dockerfile
@@ -0,0 +1,11 @@
+FROM tier/grouper-training-env:base
+
+LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
+      Vendor="TIER" \
+      ImageType="Grouper Training" \
+      ImageName=$imagename \
+      ImageOS=centos7
+
+ENV USERTOKEN=ex211.1.1
+
+# Nothing else needed for this exercise. Start empty and end empty
diff --git a/ex211/manualBuild.sh b/ex211/manualBuild.sh
new file mode 100755
index 0000000..8b2a39a
--- /dev/null
+++ b/ex211/manualBuild.sh
@@ -0,0 +1,5 @@
+docker build --tag=tier/grouper-training-env:ex211.1.1 ex211.1.1
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  say exercises for 211 build complete
+fi
diff --git a/ex301/manualBuild.sh b/ex301/manualBuild.sh
index 33e6b19..a9cf0b0 100755
--- a/ex301/manualBuild.sh
+++ b/ex301/manualBuild.sh
@@ -1,4 +1,4 @@
-docker build --tag=tier/grouper-training-env:ex301.4.1 ex301.4.1 \
+docker build --tag=tier/grouper-training-env:ex301.4.1 ex301.4.1
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
   say exercises for 301 build complete
diff --git a/manualBuild.sh b/manualBuild.sh
index a94ffee..86c0e3b 100755
--- a/manualBuild.sh
+++ b/manualBuild.sh
@@ -1,10 +1,18 @@
 docker build --pull --tag=tier/grouper-training-env:base base/ \
 && docker build --tag=tier/grouper-training-env:full_demo full-demo \
 
+pushd ex101
+./manualBuild.sh
+popd
+
 pushd ex201
 ./manualBuild.sh
 popd
 
+pushd ex211
+./manualBuild.sh
+popd
+
 pushd ex301
 ./manualBuild.sh
 popd