Skip to content

possibility to choose rstudio version #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

possibility to choose rstudio version #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be5f93e
possibility to choose rstudio version
MelineeTS Oct 8, 2020
555f658
add rstusio v4.0.1
MelineeTS Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion repo/packages/J/jupyter/0/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 10 additions & 1 deletion repo/packages/R/rstudio/0/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"required": ["name", "cpus", "mem"]
},
"rstudio": {
"description": "RStudio specific configuration",
"description": "RStudio specific configuration and advanced parameters",
"type": "object",
"properties": {
"password": {
Expand All @@ -44,6 +44,15 @@
"value": "{{user.password}}"
}
},
"image": {
"type": "string",
"description": "Version of RStudio to use",
"default": "inseefrlab/rstudio:v3.6.3",
"enum": [
"inseefrlab/rstudio:v4.0.1",
"inseefrlab/rstudio:v3.6.3"
]
},
"spark-ui": {
"type": "boolean",
"title": "Enable spark-ui",
Expand Down
44 changes: 22 additions & 22 deletions repo/packages/R/rstudio/0/marathon.json.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}",
Expand All @@ -32,7 +32,7 @@
"container": {
"type": "DOCKER",
"docker": {
"image": "{{resource.assets.container.docker.image}}",
"image": "{{rstudio.image}}",
"forcePullImage": true,
"portMappings": [
{ "containerPort": 8787, "hostPort": 0 },
Expand Down Expand Up @@ -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,
Expand Down
7 changes: 0 additions & 7 deletions repo/packages/R/rstudio/0/resource.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
}