Skip to content
Snippets Groups Projects
Verified Commit 6bbc638e authored by Jaromír Hradil's avatar Jaromír Hradil
Browse files

Updating docker image versions 

Adding setting to enable/disable RTC mode

Adding introspect URL for latest EGI hub introspect PR
parent 3b15a0dd
No related branches found
No related tags found
1 merge request!13Adding new updates from newest Docker images
Hide whitespace changes
Inline Side-by-side
cesnet-central/deployments/fullhub.yaml
+ 9
− 2
View file @ 6bbc638e
...@@ -52,7 +52,7 @@ singleuser: ...@@ -52,7 +52,7 @@ singleuser:
defaultUrl: "/lab" defaultUrl: "/lab"
image: image:
name: eginotebooks/single-user-eosc name: eginotebooks/single-user-eosc
tag: "sha-3473906" tag: "sha-dea4fa2"
profileList: profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM (non-collaboratice) - display_name: Small Environment - 2 vCPU / 4 GB RAM (non-collaboratice)
description: > description: >
...@@ -150,6 +150,12 @@ singleuser: ...@@ -150,6 +150,12 @@ singleuser:
# #
/usr/local/bin/jupyterhub-wait-remote-home /usr/local/bin/jupyterhub-wait-remote-home
# Disables RTC extension. To enable it set this env variable in kubespawner_override
# to JUPYTERHUB_ALLOW_TOKEN_IN_URL="1"
if [ -z JUPYTERHUB_ALLOW_TOKEN_IN_URL ]; then
jupyter-labextension disable @jupyter/collaboration-extension
fi
cd . cd .
exec jupyterhub-singleuser \ exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \ --FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
...@@ -169,7 +175,7 @@ hub: ...@@ -169,7 +175,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image: image:
name: eginotebooks/hub name: eginotebooks/hub
tag: "sha-df106d8" tag: "sha-ea893ce"
config: config:
Authenticator: Authenticator:
enable_auth_state: true enable_auth_state: true
...@@ -189,6 +195,7 @@ hub: ...@@ -189,6 +195,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization" authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token" token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo" userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}" client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}" client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback" oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
......
common/deployments/hub-production.yaml
+ 9
− 2
View file @ 6bbc638e
...@@ -52,7 +52,7 @@ singleuser: ...@@ -52,7 +52,7 @@ singleuser:
defaultUrl: "/lab" defaultUrl: "/lab"
image: image:
name: eginotebooks/single-user-eosc name: eginotebooks/single-user-eosc
tag: "sha-3473906" tag: "sha-dea4fa2"
profileList: profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM - display_name: Small Environment - 2 vCPU / 4 GB RAM
description: > description: >
...@@ -132,6 +132,12 @@ singleuser: ...@@ -132,6 +132,12 @@ singleuser:
# #
/usr/local/bin/jupyterhub-wait-remote-home /usr/local/bin/jupyterhub-wait-remote-home
# Disables RTC extension. To enable it set this env variable in kubespawner_override
# to JUPYTERHUB_ALLOW_TOKEN_IN_URL="1"
if [ -z JUPYTERHUB_ALLOW_TOKEN_IN_URL ]; then
jupyter-labextension disable @jupyter/collaboration-extension
fi
cd . cd .
exec jupyterhub-singleuser \ exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \ --FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
...@@ -151,7 +157,7 @@ hub: ...@@ -151,7 +157,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image: image:
name: eginotebooks/hub name: eginotebooks/hub
tag: "sha-df106d8" tag: "sha-ea893ce"
config: config:
Authenticator: Authenticator:
enable_auth_state: true enable_auth_state: true
...@@ -170,6 +176,7 @@ hub: ...@@ -170,6 +176,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization" authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token" token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo" userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}" client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}" client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback" oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
......
common/deployments/hub-staging.yaml
+ 9
− 2
View file @ 6bbc638e
...@@ -52,7 +52,7 @@ singleuser: ...@@ -52,7 +52,7 @@ singleuser:
defaultUrl: "/lab" defaultUrl: "/lab"
image: image:
name: eginotebooks/single-user-eosc name: eginotebooks/single-user-eosc
tag: "sha-3473906" tag: "sha-dea4fa2"
profileList: profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM - display_name: Small Environment - 2 vCPU / 4 GB RAM
description: > description: >
...@@ -132,6 +132,12 @@ singleuser: ...@@ -132,6 +132,12 @@ singleuser:
# #
/usr/local/bin/jupyterhub-wait-remote-home /usr/local/bin/jupyterhub-wait-remote-home
# Disables RTC extension. To enable it set this env variable in kubespawner_override
# to JUPYTERHUB_ALLOW_TOKEN_IN_URL="1"
if [ -z JUPYTERHUB_ALLOW_TOKEN_IN_URL ]; then
jupyter-labextension disable @jupyter/collaboration-extension
fi
cd . cd .
exec jupyterhub-singleuser \ exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \ --FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
...@@ -151,7 +157,7 @@ hub: ...@@ -151,7 +157,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image: image:
name: eginotebooks/hub name: eginotebooks/hub
tag: "sha-df106d8" tag: "sha-ea893ce"
config: config:
Authenticator: Authenticator:
enable_auth_state: true enable_auth_state: true
...@@ -170,6 +176,7 @@ hub: ...@@ -170,6 +176,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization" authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token" token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo" userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}" client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}" client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback" oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
......
common/playbooks/files/jupyterhub-jwt.yaml
+ 1
− 1
View file @ 6bbc638e
...@@ -20,7 +20,7 @@ spec: ...@@ -20,7 +20,7 @@ spec:
containers: containers:
- name: jwt - name: jwt
# recommended to keep it in sync with */deployments/*.yaml # recommended to keep it in sync with */deployments/*.yaml
image: eginotebooks/hub:sha-df106d8 image: eginotebooks/hub:sha-ea893ce
args: args:
- fastapi - fastapi
- run - run
......
testing/deployments/hub.yaml
+ 9
− 2
View file @ 6bbc638e
...@@ -53,7 +53,7 @@ singleuser: ...@@ -53,7 +53,7 @@ singleuser:
defaultUrl: "/lab" defaultUrl: "/lab"
image: image:
name: eginotebooks/single-user-eosc name: eginotebooks/single-user-eosc
tag: "sha-3473906" tag: "sha-dea4fa2"
profileList: profileList:
- display_name: Small Environment - 2 vCPU / 4 GB RAM - display_name: Small Environment - 2 vCPU / 4 GB RAM
description: > description: >
...@@ -133,6 +133,12 @@ singleuser: ...@@ -133,6 +133,12 @@ singleuser:
# #
/usr/local/bin/jupyterhub-wait-remote-home /usr/local/bin/jupyterhub-wait-remote-home
# Disables RTC extension. To enable it set this env variable in kubespawner_override
# to JUPYTERHUB_ALLOW_TOKEN_IN_URL="1"
if [ -z JUPYTERHUB_ALLOW_TOKEN_IN_URL ]; then
jupyter-labextension disable @jupyter/collaboration-extension
fi
cd . cd .
exec jupyterhub-singleuser \ exec jupyterhub-singleuser \
--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \ --FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints' \
...@@ -152,7 +158,7 @@ hub: ...@@ -152,7 +158,7 @@ hub:
# recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml # recommended to keep in sync with common/playbooks/files/jupyterhub-jwt.yaml
image: image:
name: eginotebooks/hub name: eginotebooks/hub
tag: "sha-df106d8" tag: "sha-ea893ce"
config: config:
Authenticator: Authenticator:
enable_auth_state: true enable_auth_state: true
...@@ -171,6 +177,7 @@ hub: ...@@ -171,6 +177,7 @@ hub:
authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization" authorize_url: "https://{{ secret['checkin_host'] }}/OIDC/authorization"
token_url: "https://{{ secret['checkin_host'] }}/OIDC/token" token_url: "https://{{ secret['checkin_host'] }}/OIDC/token"
userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo" userdata_url: "https://{{ secret['checkin_host'] }}/OIDC/userinfo"
introspect_url: "https://{{ secret['checkin_host'] }}/OIDC/introspect"
client_id: "{{ secret['client_id'] }}" client_id: "{{ secret['client_id'] }}"
client_secret: "{{ secret['client_secret'] }}" client_secret: "{{ secret['client_secret'] }}"
oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback" oauth_callback_url: "https://{{ notebooks_hostname }}/hub/oauth_callback"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment