Merge branch 'release/6.2.1'

openshift-homeroom · Sep 9, 2019 · 3b49f54 · 3b49f54
2 parents 04c5023 + 89a6dd6
commit 3b49f54
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 7 deletions.
diff --git a/templates/hosted-workshop-development.json b/templates/hosted-workshop-development.json
@@ -27,6 +27,10 @@
             "name": "HOMEROOM_NAME",
             "value": ""
         },
+        {
+            "name": "HOMEROOM_LINK",
+            "value": ""
+        },
         {
             "name": "WORKSHOP_TITLE",
             "value": ""
@@ -399,6 +403,10 @@
                                         "name": "HOMEROOM_NAME",
                                         "value": "${HOMEROOM_NAME}"
                                     },
+                                    {
+                                        "name": "HOMEROOM_LINK",
+                                        "value": "${HOMEROOM_LINK}"
+                                    },
                                     {
                                         "name": "TERMINAL_IMAGE",
                                         "value": "${TERMINAL_IMAGE}"

diff --git a/templates/hosted-workshop-production.json b/templates/hosted-workshop-production.json
@@ -27,6 +27,10 @@
             "name": "HOMEROOM_NAME",
             "value": ""
         },
+        {
+            "name": "HOMEROOM_LINK",
+            "value": ""
+        },
         {
             "name": "WORKSHOP_TITLE",
             "value": ""
@@ -84,7 +88,7 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
             "required": true
         },
         {
@@ -359,6 +363,10 @@
                                         "name": "HOMEROOM_NAME",
                                         "value": "${HOMEROOM_NAME}"
                                     },
+                                    {
+                                        "name": "HOMEROOM_LINK",
+                                        "value": "${HOMEROOM_LINK}"
+                                    },
                                     {
                                         "name": "TERMINAL_IMAGE",
                                         "value": "${TERMINAL_IMAGE}"

diff --git a/templates/jumpbox-server-production.json b/templates/jumpbox-server-production.json
@@ -45,12 +45,12 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
             "required": true
         },
         {
             "name": "KEYCLOAK_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.1",
             "required": true
         },
         {

diff --git a/templates/learning-portal-production.json b/templates/learning-portal-production.json
@@ -89,7 +89,7 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
             "required": true
         },
         {

diff --git a/templates/terminal-server-development.json b/templates/terminal-server-development.json
@@ -27,6 +27,10 @@
             "name": "HOMEROOM_NAME",
             "value": ""
         },
+        {
+            "name": "HOMEROOM_LINK",
+            "value": ""
+        },
         {
             "name": "WORKSHOP_TITLE",
             "value": ""
@@ -399,6 +403,10 @@
                                         "name": "HOMEROOM_NAME",
                                         "value": "${HOMEROOM_NAME}"
                                     },
+                                    {
+                                        "name": "HOMEROOM_LINK",
+                                        "value": "${HOMEROOM_LINK}"
+                                    },
                                     {
                                         "name": "TERMINAL_IMAGE",
                                         "value": "${TERMINAL_IMAGE}"

diff --git a/templates/terminal-server-production.json b/templates/terminal-server-production.json
@@ -27,6 +27,10 @@
             "name": "HOMEROOM_NAME",
             "value": ""
         },
+        {
+            "name": "HOMEROOM_LINK",
+            "value": ""
+        },
         {
             "name": "WORKSHOP_TITLE",
             "value": ""
@@ -84,7 +88,7 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
             "required": true
         },
         {
@@ -359,6 +363,10 @@
                                         "name": "HOMEROOM_NAME",
                                         "value": "${HOMEROOM_NAME}"
                                     },
+                                    {
+                                        "name": "HOMEROOM_LINK",
+                                        "value": "${HOMEROOM_LINK}"
+                                    },
                                     {
                                         "name": "TERMINAL_IMAGE",
                                         "value": "${TERMINAL_IMAGE}"

diff --git a/templates/user-workspace-production.json b/templates/user-workspace-production.json
@@ -85,12 +85,12 @@
         },
         {
             "name": "SPAWNER_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-spawner:6.2.1",
             "required": true
         },
         {
             "name": "KEYCLOAK_IMAGE",
-            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.0",
+            "value": "quay.io/openshifthomeroom/workshop-keycloak:6.2.1",
             "required": true
         },
         {