Merge branch 'develop' of github.com:fhswf/Jupyterhub-K8s into develop

fhswf · Sep 12, 2024 · 54b2b96 · 54b2b96
2 parents 5f1550f + cdc87fd
commit 54b2b96
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/base-images/vscode/Dockerfile b/base-images/vscode/Dockerfile
@@ -1,7 +1,7 @@
 ARG JUPYTER_VARIANT
 ARG CUDA_VARIANT
 
-FROM jupyter/${JUPYTER_VARIANT}-notebook:lab-3.6.3 as nocuda
+FROM jupyter/${JUPYTER_VARIANT}-notebook:ubuntu-22.04 as nocuda
 
 ARG JUPYTER_VARIANT
 ARG CUDA_VARIANT
@@ -335,8 +335,10 @@ RUN code-server --extensions-dir ${CODE_BUILTIN_EXTENSIONS_DIR} --install-extens
     && cd /tmp 
 
 RUN pip install \
-    jupyterlab-lsp==4.3.0 \
-    jupyter-server-proxy==4.0.0  \
+    jupyterlab-lsp \
+    jupyter-server-proxy \
+    jupyterlab-night \
+    jupyter-collaboration \
     git+https://github.com/fhswf/Jupyterhub-K8s.git@main#subdirectory=packages/jupyter_vscodeserver_proxy  \
     jedi-language-server \
     nbgitpuller \

diff --git a/images/PKI/Dockerfile b/images/PKI/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-2c18bf4
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-e9575c4
 FROM $BASE_CONTAINER
 ARG BASE_CONTAINER
 ENV BUILD_IMAGE_NAME pki

diff --git a/images/compilerbau/Dockerfile b/images/compilerbau/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-f7a5a4b
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-e9575c4
 FROM $BASE_CONTAINER
 ARG BASE_CONTAINER
 ENV BUILD_IMAGE_NAME compilerbau

diff --git a/images/deepml/Dockerfile b/images/deepml/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-cuda-devel:sha-2c18bf4
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-cuda-devel:sha-e9575c4
 FROM $BASE_CONTAINER
 ARG BASE_CONTAINER
 ENV BUILD_IMAGE_NAME deepml

diff --git a/images/eml/Dockerfile b/images/eml/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-2c18bf4
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-e9575c4
 FROM $BASE_CONTAINER
 ARG BASE_CONTAINER
 ENV BUILD_IMAGE_NAME eml

diff --git a/images/fulp/Dockerfile b/images/fulp/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-minimal-nocuda:sha-4dd0f7a
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-minimal-nocuda:sha-e9575c4
 FROM $BASE_CONTAINER
 ARG BASE_CONTAINER
 ENV BUILD_IMAGE_NAME fulp

diff --git a/images/grader/Dockerfile b/images/grader/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-2c18bf4
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-scipy-nocuda:sha-e9575c4
 FROM $BASE_CONTAINER
 ARG BASE_CONTAINER
 ENV BUILD_IMAGE_NAME grader

diff --git a/images/java/Dockerfile b/images/java/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-minimal-nocuda:sha-f7a5a4b
+ARG BASE_CONTAINER=ghcr.io/fhswf/jupyterhub-k8s/vscode-minimal-nocuda:sha-e9575c4
 
 FROM $BASE_CONTAINER
 

diff --git a/jupyterhub/Dockerfile b/jupyterhub/Dockerfile
@@ -1,4 +1,7 @@
-FROM jupyterhub/k8s-hub:2.0.1-0.dev.git.6026.h0e7347d7
+FROM jupyterhub/k8s-hub:3.2.1 
+# hub 4.0.2
+# FROM jupyterhub/k8s-hub:2.0.1-0.dev.git.6026.h0e7347d
+
 # latest version for jupyterhub 3.1.1  2.0.1-0.dev.git.6026.h0e7347d7
 # latest version for jupyterhub 3.0.0  2.0.1-0.dev.git.5939.h617bec32
 ENV PYTHONUNBUFFERED=1