From a54d90172ddeb4429b2076db55023877bf1e847e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?=
 <naoyabpr@gmail.com>
Date: Wed, 29 Jan 2020 10:51:37 -0500
Subject: [PATCH 1/6] Create apply_tags

Draft!
---
 datascience-notebook/hooks/apply_tags | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 datascience-notebook/hooks/apply_tags

diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
new file mode 100644
index 00000000..5bb4713d
--- /dev/null
+++ b/datascience-notebook/hooks/apply_tags
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+# Tag the latest build with the short git sha as well as version of key runtimes
+# and packages. 
+GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
+docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG"
+PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')"
+docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
+R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | tr -d '\r')"
+docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
+JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r')"
+docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"
+NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')"
+docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }"
+LAB_VERSION_TAG="lab-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-lab --version | tr -d '\r')"
+docker tag $IMAGE_NAME "$DOCKER_REPO:${LAB_VERSION_TAG%%\r}"
+HUB_VERSION_TAG="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyterhub --version | tr -d '\r')"
+docker tag $IMAGE_NAME "$DOCKER_REPO:${HUB_VERSION_TAG%%\r}"

From 6fb99219fb625e7a0be1e24be257dfbf3ac00e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?=
 <naoyabpr@gmail.com>
Date: Wed, 29 Jan 2020 10:54:37 -0500
Subject: [PATCH 2/6] Standardize the Julia version

Julia prints a bit more so we make it conformant with the rest.
---
 datascience-notebook/hooks/apply_tags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
index 5bb4713d..6e7645f8 100644
--- a/datascience-notebook/hooks/apply_tags
+++ b/datascience-notebook/hooks/apply_tags
@@ -9,7 +9,7 @@ PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | a
 docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
 R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | tr -d '\r')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
-JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r')"
+JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r' | tr -d '[a-z| ]')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"
 NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }"

From 51a2db8d1ffdd3323aa93d225cba761a22a9141a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?=
 <naoyabpr@gmail.com>
Date: Sat, 1 Feb 2020 13:04:39 -0500
Subject: [PATCH 3/6] ACR

Address code review.
- Added apply_tags to post_push
- Verified output for versions
---
 datascience-notebook/hooks/apply_tags | 4 ++--
 datascience-notebook/hooks/post_push  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
index 6e7645f8..4df13756 100644
--- a/datascience-notebook/hooks/apply_tags
+++ b/datascience-notebook/hooks/apply_tags
@@ -7,9 +7,9 @@ GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
 docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG"
 PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
-R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | tr -d '\r')"
+R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version |  sed -n 1p | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
-JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r' | tr -d '[a-z| ]')"
+JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r' | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"
 NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }"
diff --git a/datascience-notebook/hooks/post_push b/datascience-notebook/hooks/post_push
index 1f9f1914..220afebe 100755
--- a/datascience-notebook/hooks/post_push
+++ b/datascience-notebook/hooks/post_push
@@ -1,6 +1,10 @@
 #!/bin/bash
 set -e
 
+# Apply and push all tags
+source hooks/apply_tags
+docker push $DOCKER_REPO
+
 # Tag the latest build with the short git sha. Push the tag in addition
 # to the "latest" tag already pushed.
 GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
@@ -48,4 +52,4 @@ set +e
 for url in $(echo $NEXT_BUILD_TRIGGERS | sed "s/,/ /g")
 do
     curl -X POST $url
-done
\ No newline at end of file
+done

From 231241fe6d8869ac742c4f5d82dfd698707e450c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?=
 <naoyabpr@gmail.com>
Date: Sat, 1 Feb 2020 13:08:58 -0500
Subject: [PATCH 4/6] Fix extra space typo.

---
 datascience-notebook/hooks/apply_tags | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
index 4df13756..ca433f8e 100644
--- a/datascience-notebook/hooks/apply_tags
+++ b/datascience-notebook/hooks/apply_tags
@@ -7,9 +7,9 @@ GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
 docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG"
 PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
-R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version |  sed -n 1p | awk '{print $3}')"
+R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | sed -n 1p | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
-JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r' | awk '{print $3}')"
+JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"
 NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }"

From 6450189822e793c05e589e3f75c3f7eee7c536bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?=
 <naoyabpr@gmail.com>
Date: Tue, 4 Feb 2020 21:32:35 -0500
Subject: [PATCH 5/6] Update datascience-notebook/hooks/apply_tags

Co-Authored-By: Peter Parente <parente@gmail.com>
---
 datascience-notebook/hooks/apply_tags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
index ca433f8e..f6c3113a 100644
--- a/datascience-notebook/hooks/apply_tags
+++ b/datascience-notebook/hooks/apply_tags
@@ -9,7 +9,7 @@ PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | a
 docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
 R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | sed -n 1p | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
-JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | awk '{print $3}')"
+JULIA_VERSION_TAG=="julia-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"
 NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }"

From 47a5ad58aba2daa14941e30f5fbd6345978dc030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bayo=C3=A1n=20Santiago=20Calder=C3=B3n?=
 <naoyabpr@gmail.com>
Date: Tue, 4 Feb 2020 21:32:44 -0500
Subject: [PATCH 6/6] Update datascience-notebook/hooks/apply_tags

Co-Authored-By: Peter Parente <parente@gmail.com>
---
 datascience-notebook/hooks/apply_tags | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
index f6c3113a..699120d3 100644
--- a/datascience-notebook/hooks/apply_tags
+++ b/datascience-notebook/hooks/apply_tags
@@ -7,7 +7,7 @@ GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
 docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG"
 PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
-R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | sed -n 1p | awk '{print $3}')"
+R_VERSION_TAG=="r-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | sed -n 1p | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
 JULIA_VERSION_TAG=="julia-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"