From 6a3e62433e079985f532ab1236668bac8b8b8c2a Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Sat, 29 May 2021 10:40:57 +0200
Subject: [PATCH] Fix incorrect variable substitution?

---
 .gitlab-ci.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1600dd..0f722ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,20 +34,20 @@ deploy:
     - podman push "${image_name}/ubuntu"
     - calver="$(date -u +'%Y%m%dT%H%MZ')"
     - cuda_tag="cuda-10"
-    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman push "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman image rm "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - docker pull "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:$calver_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman push "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman image rm "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - docker pull "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman push "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman image rm "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - docker pull "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - cuda_tag="cuda-11"
-    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman push "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman image rm "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - docker pull "${image_name}/jupyterhub:$calver_${cuda_tag}"
-    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:$calver_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub:${cuda_tag}" "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman push "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman image rm "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - docker pull "${image_name}/jupyterhub:${calver}_${cuda_tag}"
+    - podman tag "${image_name}/jupyterhub_vim:${cuda_tag}" "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman push "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - podman image rm "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
     - docker pull "${image_name}/jupyterhub_vim:${calver}_${cuda_tag}"
-- 
GitLab