From 887409c3e7e98ff6e7bcb28975c8c4c440fae21c Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Mon, 9 Sep 2019 22:23:46 +1000 Subject: [PATCH 1/2] Add HOMEROOM_LINK parameter. --- templates/hosted-workshop-development.json | 8 ++++++++ templates/hosted-workshop-production.json | 8 ++++++++ templates/terminal-server-development.json | 8 ++++++++ templates/terminal-server-production.json | 8 ++++++++ 4 files changed, 32 insertions(+) diff --git a/templates/hosted-workshop-development.json b/templates/hosted-workshop-development.json index 661190f..fa385e6 100644 --- 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 index 05a50b7..0babf6a 100644 --- 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": "" @@ -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/terminal-server-development.json b/templates/terminal-server-development.json index cc38ab2..4348997 100644 --- 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 index 3d36aec..870e63c 100644 --- 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": "" @@ -359,6 +363,10 @@ "name": "HOMEROOM_NAME", "value": "${HOMEROOM_NAME}" }, + { + "name": "HOMEROOM_LINK", + "value": "${HOMEROOM_LINK}" + }, { "name": "TERMINAL_IMAGE", "value": "${TERMINAL_IMAGE}" From 89a6dd617e9049ef5a686d26894fdfbace3f21ef Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Mon, 9 Sep 2019 22:24:44 +1000 Subject: [PATCH 2/2] Prepare for 6.2.1 release. --- templates/hosted-workshop-production.json | 2 +- templates/jumpbox-server-production.json | 4 ++-- templates/learning-portal-production.json | 2 +- templates/terminal-server-production.json | 2 +- templates/user-workspace-production.json | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/hosted-workshop-production.json b/templates/hosted-workshop-production.json index 0babf6a..0691e7f 100644 --- a/templates/hosted-workshop-production.json +++ b/templates/hosted-workshop-production.json @@ -88,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 }, { diff --git a/templates/jumpbox-server-production.json b/templates/jumpbox-server-production.json index 8e8bff7..c49b1de 100644 --- 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 index 727543b..d937525 100644 --- 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-production.json b/templates/terminal-server-production.json index 870e63c..b8c9795 100644 --- a/templates/terminal-server-production.json +++ b/templates/terminal-server-production.json @@ -88,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 }, { diff --git a/templates/user-workspace-production.json b/templates/user-workspace-production.json index 28944d5..c460719 100644 --- 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 }, {