diff --git a/deployments/biology/image/infra-requirements.txt b/deployments/biology/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/biology/image/infra-requirements.txt +++ b/deployments/biology/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/data8/image/infra-requirements.txt b/deployments/data8/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/data8/image/infra-requirements.txt +++ b/deployments/data8/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/data8x/image/infra-requirements.txt b/deployments/data8x/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/data8x/image/infra-requirements.txt +++ b/deployments/data8x/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/datahub/images/default/infra-requirements.txt b/deployments/datahub/images/default/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/datahub/images/default/infra-requirements.txt +++ b/deployments/datahub/images/default/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/dlab/image/infra-requirements.txt b/deployments/dlab/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/dlab/image/infra-requirements.txt +++ b/deployments/dlab/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/eecs/image/infra-requirements.txt b/deployments/eecs/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/eecs/image/infra-requirements.txt +++ b/deployments/eecs/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/ischool/image/infra-requirements.txt b/deployments/ischool/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/ischool/image/infra-requirements.txt +++ b/deployments/ischool/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/julia/image/infra-requirements.txt b/deployments/julia/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/julia/image/infra-requirements.txt +++ b/deployments/julia/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/deployments/publichealth/image/infra-requirements.txt b/deployments/publichealth/image/infra-requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/deployments/publichealth/image/infra-requirements.txt +++ b/deployments/publichealth/image/infra-requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2 diff --git a/hub/values.yaml b/hub/values.yaml index 4e80049f0..aa627d3e3 100644 --- a/hub/values.yaml +++ b/hub/values.yaml @@ -141,7 +141,7 @@ jupyterhub: # Generated by chartpress image: name: gcr.io/ucb-datahub-2018/jupyterhub-hub - tag: '0.0.1-n4282.h190b8b78' + tag: '0.0.1-n4557.he3eb9e03' networkPolicy: enabled: true ingress: diff --git a/images/hub/Dockerfile b/images/hub/Dockerfile index 62f077ed6..37848e29d 100644 --- a/images/hub/Dockerfile +++ b/images/hub/Dockerfile @@ -8,7 +8,8 @@ USER root RUN apt update > /dev/null && apt install --yes npm > /dev/null # Brings in https://github.com/jupyterhub/jupyterhub/pull/3579 -RUN python3 -m pip install -U git+https://github.com/meeseeksmachine/jupyterhub@auto-backport-of-pr-3488-on-1.4.x +# and https://github.com/jupyterhub/jupyterhub/pull/3639 +RUN python3 -m pip install -U git+https://github.com/jupyterhub/jupyterhub.git@69a1e97fbee1711e3fdb5fd795e349a4eb395060 COPY canvasauthenticator /srv/canvasauthenticator RUN python3 -m pip install --no-cache /srv/canvasauthenticator diff --git a/scripts/infra-packages/requirements.txt b/scripts/infra-packages/requirements.txt index 39b664a94..d6cdaae2a 100644 --- a/scripts/infra-packages/requirements.txt +++ b/scripts/infra-packages/requirements.txt @@ -11,7 +11,7 @@ notebook==6.4.3 # Seems to cause a version conflict with jupyter-server-proxy jupyter-client<7.0 -jupyterlab==3.1.10 +jupyterlab==3.1.17 nbconvert==6.1.0 retrolab==0.3.5 nbgitpuller==0.10.2