From 4fe1156b8493224e67577795bf08d7aee0a00e1f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Wed, 7 Sep 2022 21:53:34 -0700 Subject: [PATCH] Bump version of z2jh - Removes custom version of jupyterhub installed, as that has been merged into latest z2jh - We keep the version of oauthenticator, as I'm not sure it has been merged and released Ref https://github.com/2i2c-org/infrastructure/issues/1055 Ref https://github.com/2i2c-org/infrastructure/issues/1102 Ref https://github.com/2i2c-org/infrastructure/issues/1589 --- helm-charts/basehub/Chart.yaml | 2 +- helm-charts/images/hub/Dockerfile | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/helm-charts/basehub/Chart.yaml b/helm-charts/basehub/Chart.yaml index 4b76ee29f..6c5bd6de5 100644 --- a/helm-charts/basehub/Chart.yaml +++ b/helm-charts/basehub/Chart.yaml @@ -11,5 +11,5 @@ dependencies: # images/hub/Dockerfile, and will also involve manually building and pushing # the Dockerfile to https://quay.io/2i2c/pilot-hub. Details about this can # be found in the Dockerfile's comments. - version: 1.1.3-n648.hab95aa08 + version: 2.0.0-beta.1.git.5783.h867f4331 repository: https://jupyterhub.github.io/helm-chart/ diff --git a/helm-charts/images/hub/Dockerfile b/helm-charts/images/hub/Dockerfile index 864df35f8..f7167e74b 100644 --- a/helm-charts/images/hub/Dockerfile +++ b/helm-charts/images/hub/Dockerfile @@ -11,19 +11,12 @@ # `chartpress --push --builder docker-buildx --platform linux/amd64` # Ref: https://cloudolife.com/2022/03/05/Infrastructure-as-Code-IaC/Container/Docker/Docker-buildx-support-multiple-architectures-images/ # -FROM jupyterhub/k8s-hub:1.1.3-n644.h35436cda +FROM jupyterhub/k8s-hub:2.0.0-beta.1.git.5781.hc5adeae4 ENV CONFIGURATOR_VERSION ed7e3a0df1e3d625d10903ef7d7fd9c2fbb548db RUN pip install --no-cache git+https://github.com/yuvipanda/jupyterhub-configurator@${CONFIGURATOR_VERSION} -# Needed to install JupyterHub from source -USER root -RUN apt update --yes > /dev/null && apt install --yes --no-install-recommends nodejs npm > /dev/null -USER $NB_USER -# Until https://github.com/jupyterhub/jupyterhub/pull/3984 is merged -RUN pip install --upgrade git+https://github.com/meeseeksmachine/jupyterhub@72e4119e1a9f5fead690cb399dba36143d6d2ecc - # Latest version comes with some breaking changes https://oauthenticator.readthedocs.io/en/latest/migrations.html#migrating-cilogonoauthenticator-to-version-15-0 RUN pip install --no-cache --upgrade git+https://github.com/jupyterhub/oauthenticator@6cf6599d99b47f99db3826ceaaedf467af14a05d