From be5f93e4acf00e55336ee2149e811d6f5801f93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9lin=C3=A9e=20Treppoz-Salomon?= Date: Thu, 8 Oct 2020 22:45:58 +0200 Subject: [PATCH 1/2] possibility to choose rstudio version --- repo/packages/J/jupyter/0/config.json | 2 +- repo/packages/R/rstudio/0/config.json | 11 ++++- .../R/rstudio/0/marathon.json.mustache | 44 +++++++++---------- repo/packages/R/rstudio/0/resource.json | 7 --- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/repo/packages/J/jupyter/0/config.json b/repo/packages/J/jupyter/0/config.json index dfcaaf4..f8872d2 100644 --- a/repo/packages/J/jupyter/0/config.json +++ b/repo/packages/J/jupyter/0/config.json @@ -47,7 +47,7 @@ }, "image": { "type": "string", - "description": "Version of vscode to use", + "description": "Version of Jupyter to use", "default": "inseefrlab/jupyter-datascience:v3.0.0-3.2.1", "enum": [ "jupyter/datascience-notebook", diff --git a/repo/packages/R/rstudio/0/config.json b/repo/packages/R/rstudio/0/config.json index 68fa9db..c744411 100644 --- a/repo/packages/R/rstudio/0/config.json +++ b/repo/packages/R/rstudio/0/config.json @@ -33,7 +33,7 @@ "required": ["name", "cpus", "mem"] }, "rstudio": { - "description": "RStudio specific configuration", + "description": "RStudio specific configuration and advanced parameters", "type": "object", "properties": { "password": { @@ -44,6 +44,15 @@ "value": "{{user.password}}" } }, + "image": { + "type": "string", + "description": "Version of RStudio to use", + "default": "inseefrlab/rstudio:v4.0.3", + "enum": [ + "inseefrlab/rstudio:v4.0.3", + "inseefrlab/rstudio:v3.6.3" + ] + }, "spark-ui": { "type": "boolean", "title": "Enable spark-ui", diff --git a/repo/packages/R/rstudio/0/marathon.json.mustache b/repo/packages/R/rstudio/0/marathon.json.mustache index 3e914c5..2584e9d 100644 --- a/repo/packages/R/rstudio/0/marathon.json.mustache +++ b/repo/packages/R/rstudio/0/marathon.json.mustache @@ -17,7 +17,7 @@ "VAULT_ADDR": "{{vault.url}}", "VAULT_TOKEN": "{{vault.token}}", {{#vault.secret}} - "VAULT_RELATIVE_PATH": "{{vault.secret}}", + "VAULT_RELATIVE_PATH": "{{vault.secret}}", {{/vault.secret}} "VAULT_TOP_DIR": "{{vault.directory}}", "VAULT_MOUNT": "{{vault.mount}}", @@ -32,7 +32,7 @@ "container": { "type": "DOCKER", "docker": { - "image": "{{resource.assets.container.docker.image}}", + "image": "{{rstudio.image}}", "forcePullImage": true, "portMappings": [ { "containerPort": 8787, "hostPort": 0 }, @@ -64,37 +64,37 @@ "HAPROXY_0_FRONTEND_HEAD":"", "HAPROXY_0_FRONTEND_BACKEND_GLUE":"", {{#networking.whitelist.enable}} - "HAPROXY_0_BACKEND_NETWORK_ALLOWED_ACL": "{{networking.whitelist.ip}}", + "HAPROXY_0_BACKEND_NETWORK_ALLOWED_ACL": "{{networking.whitelist.ip}}", {{/networking.whitelist.enable}} {{#rstudio.spark-ui}} - "HAPROXY_1_VHOST": "{{networking.virtual-host-sparkui}}", - "HAPROXY_1_REDIRECT_TO_HTTPS": "{{networking.https-redirect}}", - "HAPROXY_1_FRONTEND_HEAD": "", - "HAPROXY_1_FRONTEND_BACKEND_GLUE": "", - "HAPROXY_1_ENABLED":"true", - {{#networking.whitelist.enable}} - "HAPROXY_1_BACKEND_NETWORK_ALLOWED_ACL": "{{networking.whitelist.ip}}", - {{/networking.whitelist.enable}} + "HAPROXY_1_VHOST": "{{networking.virtual-host-sparkui}}", + "HAPROXY_1_REDIRECT_TO_HTTPS": "{{networking.https-redirect}}", + "HAPROXY_1_FRONTEND_HEAD": "", + "HAPROXY_1_FRONTEND_BACKEND_GLUE": "", + "HAPROXY_1_ENABLED":"true", + {{#networking.whitelist.enable}} + "HAPROXY_1_BACKEND_NETWORK_ALLOWED_ACL": "{{networking.whitelist.ip}}", + {{/networking.whitelist.enable}} {{/rstudio.spark-ui}} "MARATHON_SINGLE_INSTANCE_APP": "true" }, "fetch": [ - { - "uri": "{{init.global}}", - "extract": false, - "executable": true, - "cache": false, - "destPath": "onyxia-init.sh" - } - {{#script.uri}} - , + { + "uri": "{{init.global}}", + "extract": false, + "executable": true, + "cache": false, + "destPath": "onyxia-init.sh" + } + {{#script.uri}} + , { "uri": "{{script.uri}}", "extract": false, "executable": true, "cache": false - } - {{/script.uri}} + } + {{/script.uri}} ], "upgradeStrategy":{ "minimumHealthCapacity": 0, diff --git a/repo/packages/R/rstudio/0/resource.json b/repo/packages/R/rstudio/0/resource.json index 654fc1f..bb80010 100644 --- a/repo/packages/R/rstudio/0/resource.json +++ b/repo/packages/R/rstudio/0/resource.json @@ -3,12 +3,5 @@ "icon-small": "https://secure.gravatar.com/avatar/5809d093183fe6ca0174066078054949.jpg", "icon-medium": "https://secure.gravatar.com/avatar/5809d093183fe6ca0174066078054949.jpg", "icon-large": "https://secure.gravatar.com/avatar/5809d093183fe6ca0174066078054949.jpg" - }, - "assets": { - "container": { - "docker": { - "image": "inseefrlab/rstudio" - } - } } } From 555f658b12b4bee696e974bf7bf404a3ac9e5ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9lin=C3=A9e=20Treppoz-Salomon?= Date: Fri, 9 Oct 2020 18:43:19 +0200 Subject: [PATCH 2/2] add rstusio v4.0.1 --- repo/packages/R/rstudio/0/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo/packages/R/rstudio/0/config.json b/repo/packages/R/rstudio/0/config.json index c744411..8562005 100644 --- a/repo/packages/R/rstudio/0/config.json +++ b/repo/packages/R/rstudio/0/config.json @@ -47,9 +47,9 @@ "image": { "type": "string", "description": "Version of RStudio to use", - "default": "inseefrlab/rstudio:v4.0.3", + "default": "inseefrlab/rstudio:v3.6.3", "enum": [ - "inseefrlab/rstudio:v4.0.3", + "inseefrlab/rstudio:v4.0.1", "inseefrlab/rstudio:v3.6.3" ] },