Updated J-hub to v5.4, fixed issues with singleuser container startup.

Author: vladd-bit

Dockerfile_hub

@@ -1,4 +1,4 @@
-FROM jupyterhub/jupyterhub:5
+FROM jupyterhub/jupyterhub:5.4
 
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
@@ -97,7 +97,7 @@ RUN pip3 install --no-cache-dir setuptools wheel virtualenv cython netifaces
 
 # jupyterhub stuff
 RUN pip3 install --no-cache-dir ipywidgets importlib_metadata jupyterhub-firstuseauthenticator dockerspawner jupyterhub-nativeauthenticator
-RUN pip3 install --no-cache-dir jupyterlab_widgets dask-labextension
+RUN pip3 install --no-cache-dir jupyterlab_widgets dask-labextension jupyter_contrib_nbextensions
 RUN pip3 install --no-cache-dir jupyterhub-firstuseauthenticator jupyterhub-systemdspawner jupyterhub-jwtauthenticator jupyterhub-client jupyterhub-kerberosauthenticator --ignore-installed PyYAML 
 RUN pip3 install --no-cache-dir jupyterhub-ldapauthenticator jupyterhub-nanowireauthenticator jupyterhub-kubespawner jupyterhub-idle-culler
 
@@ -107,8 +107,7 @@ RUN mkdir -p /home/jovyan/scratch
 RUN chmod -R 777 /home/jovyan/scratch
 RUN chmod g+s /home/jovyan/scratch
 
+RUN chown -R 1000:1000 /srv/jupyterhub
+
 # copy scripts and config files
 COPY config/jupyterhub_config.py /etc/jupyterhub/
-
-ENV NB_UID=1000
-USER $NB_UID

Dockerfile_singleuser

@@ -1,4 +1,4 @@
-FROM jupyterhub/singleuser:5
+FROM jupyterhub/singleuser:5.4
 
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
@@ -249,4 +249,4 @@ RUN echo "cd /home/jovyan/work" >> /home/jovyan/.bashrc
 # Configure container startup
 ENTRYPOINT ["tini", "-g", "--"]
 
-CMD ["jupyterhub-singleuser"]
+CMD ["start-singleuser.py"]

config/jupyterhub_config.py

@@ -24,7 +24,7 @@ class LocalNativeAuthenticator(NativeAuthenticator, LocalAuthenticator):
 # jupyter/docker-stacks *-notebook images as the Docker run command when
 # spawning containers.  Optionally, you can override the Docker run command
 # using the DOCKER_SPAWN_CMD environment variable.
-SPAWN_CMD = os.environ.get("DOCKER_SPAWN_CMD", "start-singleuser.sh")
+SPAWN_CMD = os.environ.get("DOCKER_SPAWN_CMD", "start-singleuser.py")
 
 # Connect containers to this Docker network
 # IMPORTANT, THIS MUST MATCH THE NETWORK DECLARED in "services.yml", by default: "cogstack-net"
@@ -65,7 +65,7 @@ class LocalNativeAuthenticator(NativeAuthenticator, LocalAuthenticator):
 os.environ["http_proxy"] = ""   
 os.environ["https_proxy"] = ""
 
-c: Config = get_config() #noqa
+c: Config = get_config() 
 
 # Spawn containers from this image
 # Either use the CoGstack one from the repo which is huge and contains all the stuff needed or,
@@ -207,8 +207,12 @@ def per_user_limit(role):
 
 # set DockerSpawner args
 c.DockerSpawner.extra_create_kwargs = {"user": "root"}
-c.DockerSpawner.cmd = [SPAWN_CMD] if isinstance(SPAWN_CMD, str) else SPAWN_CMD
+c.DockerSpawner.args = [
+    "--allow-root",
+    "--NotebookApp.token=''",
+]
 
+c.DockerSpawner.cmd = [SPAWN_CMD] if isinstance(SPAWN_CMD, str) else SPAWN_CMD
 
 c.DockerSpawner.notebook_dir = NOTEBOOK_DIR
 
@@ -277,20 +281,20 @@ def per_user_limit(role):
 c.FirstUseAuthenticator.create_users = True
 c.JupyterHub.authenticator_class = "firstuseauthenticator.FirstUseAuthenticator" 
 
-
-
 # User containers will access hub by container name on the Docker network
 c.JupyterHub.ip = "0.0.0.0"
 c.JupyterHub.hub_ip = "0.0.0.0"
 c.JupyterHub.hub_connect_ip = HUB_CONTAINER_IP_OR_NAME
 
-
 jupyter_hub_port = int(os.environ.get("JUPYTERHUB_INTERNAL_PORT", 8888))
 jupyter_hub_proxy_api_port = int(os.environ.get("JUPYTERHUB_INTERNAL_PROXY_API_PORT", 8887))
 jupyter_hub_ssl_port = int(os.environ.get("JUPYTERHUB_SSL_PORT", 443))
 jupyter_hub_proxy_url = str(os.environ.get("JUPYTERHUB_PROXY_API_URL", "http://127.0.0.1:"))
 
 c.ConfigurableHTTPProxy.api_url = jupyter_hub_proxy_url + str(jupyter_hub_proxy_api_port)
+# c.JupyterHub.hub_connect_url = f"https://{HUB_CONTAINER_IP_OR_NAME}:{jupyter_hub_ssl_port}"
+# c.DockerSpawner.hub_connect_url = c.JupyterHub.hub_connect_url
+
 # ideally a private network address
 # c.JupyterHub.proxy_api_ip = "10.0.1.4"
 # c.JupyterHub.proxy_api_port = jupyter_hub_proxy_api_port

requirements.txt

@@ -2,6 +2,7 @@ wheel==0.45.1
 virtualenv==20.31.2
 ipywidgets==8.1.7
 jupyter==1.1.1
+jupyterlab==4.4.10
 jupyterlab_widgets==3.0.15
 jupyter_contrib_core==0.4.2
 jupyter_contrib_nbextensions==0.7.0