From b0862f9d3faa2a8ed0bfb1ea64da4bdba9ab58d1 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Tue, 25 Jul 2023 20:49:46 +0400 Subject: [PATCH 1/2] Remove jupyter_notebook_config.py --- base-notebook/Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index fafeb443a0..fb980da091 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -56,16 +56,12 @@ CMD ["start-notebook.sh"] # Copy local files as late as possible to avoid cache busting COPY start-notebook.sh start-singleuser.sh /usr/local/bin/ -# Currently need to have both jupyter_notebook_config and jupyter_server_config to support classic and lab +# Copy jupyter_server_config and docker_healthcheck.py COPY jupyter_server_config.py docker_healthcheck.py /etc/jupyter/ # Fix permissions on /etc/jupyter as root USER root - -# Legacy for Jupyter Notebook Server, see: [#1205](https://github.com/jupyter/docker-stacks/issues/1205) -RUN sed -re "s/c.ServerApp/c.NotebookApp/g" \ - /etc/jupyter/jupyter_server_config.py > /etc/jupyter/jupyter_notebook_config.py && \ - fix-permissions /etc/jupyter/ +RUN fix-permissions /etc/jupyter/ # HEALTHCHECK documentation: https://docs.docker.com/engine/reference/builder/#healthcheck # This healtcheck works well for `lab`, `notebook`, `nbclassic`, `server` and `retro` jupyter commands From 95d41d14c1e1d5223c7f941dd833b2e8f8964007 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Tue, 25 Jul 2023 20:51:00 +0400 Subject: [PATCH 2/2] Update Dockerfile --- base-notebook/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index fb980da091..45260fe054 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -56,7 +56,6 @@ CMD ["start-notebook.sh"] # Copy local files as late as possible to avoid cache busting COPY start-notebook.sh start-singleuser.sh /usr/local/bin/ -# Copy jupyter_server_config and docker_healthcheck.py COPY jupyter_server_config.py docker_healthcheck.py /etc/jupyter/ # Fix permissions on /etc/jupyter as root