From 3400a5b360fcb42ffd51b6f697fffbb2f0708ad4 Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Thu, 20 Mar 2025 14:24:48 +0100 Subject: [PATCH 1/4] feat: update jupyterhub base image and python version --- .github/jupyter/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/jupyter/Dockerfile b/.github/jupyter/Dockerfile index 3b05abde..e0b087a8 100644 --- a/.github/jupyter/Dockerfile +++ b/.github/jupyter/Dockerfile @@ -14,12 +14,12 @@ FROM ghcr.io/rs-python/rs-client-libraries_store:latest as rs-client -FROM ghcr.io/rs-python/quay.io/jupyter/base-notebook:hub-4.1.5 +FROM ghcr.io/rs-python/quay.io/jupyter/base-notebook:hub-5.2.1 ARG DASK_TAG="2024.5.2" ARG DASK_GATEWAY_TAG="2024.1.0" ARG PREFECT_TAG="3.1.4" -ARG PYTHON_TAG="3.11.7" +ARG PYTHON_TAG="3.12.8" USER root From 3bf2ed44b7e3e6b5ae2483b417af63700a2ae211 Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Thu, 20 Mar 2025 15:42:23 +0100 Subject: [PATCH 2/4] feat: update jupyterhub dockerfile, add xz-utils, replace libasound2 by libasound2t64, use useradd instead of adduser --- .github/jupyter/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/jupyter/Dockerfile b/.github/jupyter/Dockerfile index e0b087a8..a5ebf983 100644 --- a/.github/jupyter/Dockerfile +++ b/.github/jupyter/Dockerfile @@ -23,7 +23,7 @@ ARG PYTHON_TAG="3.12.8" USER root -RUN adduser rspy +RUN useradd -ms /bin/bash rspy ENV SHELL /bin/bash ENV HOME /home/rspy @@ -39,8 +39,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt update && \ git \ curl \ unzip \ + xz-utils \ tzdata \ - libgtk-3-0 libasound2 libx11-xcb1 \ + libgtk-3-0 libasound2t64 libx11-xcb1 \ xclip \ graphviz \ python3-pydot && \ From afa9f913866a2c1c7689c835873e770461ff1e7e Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Thu, 20 Mar 2025 16:46:09 +0100 Subject: [PATCH 3/4] fix: add group with same name as user with useradd in jupyterhub dockerfile --- .github/jupyter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/jupyter/Dockerfile b/.github/jupyter/Dockerfile index a5ebf983..eaafcc2b 100644 --- a/.github/jupyter/Dockerfile +++ b/.github/jupyter/Dockerfile @@ -23,7 +23,7 @@ ARG PYTHON_TAG="3.12.8" USER root -RUN useradd -ms /bin/bash rspy +RUN useradd -ms /bin/bash -U rspy ENV SHELL /bin/bash ENV HOME /home/rspy From 309759dcc0a8297e51e0179e21a62eb308c8a1ba Mon Sep 17 00:00:00 2001 From: nleconte-csgroup Date: Thu, 20 Mar 2025 11:59:53 +0100 Subject: [PATCH 4/4] feat: update jupyterhub inventory