wip

Author: mishushakov

template/Dockerfile

@@ -20,7 +20,7 @@ ENV R_HOME=/opt/R/${R_VERSION} \
 
 # Install Jupyter
 COPY ./requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3" --user
+RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3"
 
 # R Kernel
 RUN curl -O https://cdn.rstudio.com/r/debian-12/pkgs/r-${R_VERSION}_1_amd64.deb && sudo apt-get update && sudo apt-get install -y ./r-${R_VERSION}_1_amd64.deb && ln -s ${R_HOME}/bin/R /usr/bin/R
@@ -36,7 +36,8 @@ RUN ijsinstall --install=global
 COPY --from=denoland/deno:bin-2.0.4 /deno /usr/bin/deno
 RUN chmod +x /usr/bin/deno
 RUN deno jupyter --unstable --install
-COPY ./deno.json $HOME/.local/share/jupyter/kernels/deno/kernel.json
+RUN mkdir -p /usr/local/share/jupyter/kernels/deno
+COPY ./kernel/deno.json /usr/local/share/jupyter/kernels/deno/kernel.json
 
 # Bash Kernel
 RUN pip install bash_kernel

template/server/main.py

@@ -34,14 +34,14 @@ async def lifespan(app: FastAPI):
     global client
     client = httpx.AsyncClient()
 
-    with open("/home/user/.jupyter/kernel_id") as file:
+    with open("/root/.jupyter/kernel_id") as file:
         default_context_id = file.read().strip()
 
     default_ws = ContextWebSocket(
         default_context_id,
         str(uuid.uuid4()),
         "python",
-        "/home/user",
+        "/root",
     )
     default_websockets["python"] = default_context_id
     websockets["default"] = default_ws

template/start-up.sh

@@ -13,22 +13,22 @@ function start_jupyter_server() {
 		response=$(curl -s -o /dev/null -w "%{http_code}" "http://localhost:8888/api/status")
 	done
 
-	response=$(curl -s -X POST "localhost:8888/api/sessions" -H "Content-Type: application/json" -d '{"path": "/home/user", "kernel": {"name": "python3"}, "type": "notebook", "name": "default"}')
+	response=$(curl -s -X POST "localhost:8888/api/sessions" -H "Content-Type: application/json" -d '{"path": "/root", "kernel": {"name": "python3"}, "type": "notebook", "name": "default"}')
 	status=$(echo "${response}" | jq -r '.kernel.execution_state')
 	if [[ ${status} != "starting" ]]; then
 		echo "Error creating kernel: ${response} ${status}"
 		exit 1
 	fi
 
-	mkdir -p /home/user/.jupyter
+	mkdir -p /root/.jupyter
 	kernel_id=$(echo "${response}" | jq -r '.kernel.id')
-	echo "${kernel_id}" > /home/user/.jupyter/kernel_id
-	echo "${response}" > /home/user/.jupyter/.session_info
+	echo "${kernel_id}" > /root/.jupyter/kernel_id
+	echo "${response}" > /root/.jupyter/.session_info
 
-	cd /home/user/.server/
-	/home/user/.server/.venv/bin/uvicorn main:app --host 0.0.0.0 --port 49999 --workers 1 --no-access-log --no-use-colors >> /home/user/uvicorn_server.log 2>&1
+	cd /root/.server/
+	/root/.server/.venv/bin/uvicorn main:app --host 0.0.0.0 --port 49999 --workers 1 --no-access-log --no-use-colors
 }
 
 echo "Starting Code Interpreter server..."
 start_jupyter_server &
-MATPLOTLIBRC=/home/user/.config/matplotlib/.matplotlibrc jupyter server --IdentityProvider.token="" >> /home/user/jupyter_server.log 2>&1
+MATPLOTLIBRC=/root/.config/matplotlib/.matplotlibrc jupyter server --IdentityProvider.token=""

template/test.Dockerfile

@@ -1,8 +1,6 @@
 FROM python:3.10.14
 
-# Create a non-root user
-RUN useradd -m -s /bin/bash user
-ENV HOME=/home/user
+ENV HOME=/root
 
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:11-jdk $JAVA_HOME $JAVA_HOME
@@ -20,7 +18,7 @@ ENV PIP_DEFAULT_TIMEOUT=100 \
 
 # Install Jupyter
 COPY ./template/requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3" --user
+RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3"
 
 # Javascript Kernel
 RUN npm install -g node-gyp
@@ -30,8 +28,14 @@ RUN ijsinstall --install=global
 # Deno Kernel
 COPY --from=denoland/deno:bin-2.0.4 /deno /usr/bin/deno
 RUN chmod +x /usr/bin/deno
-RUN deno jupyter --unstable --install
-COPY ./template/deno.json $HOME/.local/share/jupyter/kernels/deno/kernel.json
+RUN deno jupyter --unstable --install && \
+    mkdir -p /usr/local/share/jupyter/kernels/deno && \
+    mv $HOME/.local/share/jupyter/kernels/deno/* /usr/local/share/jupyter/kernels/deno/ && \
+    rmdir $HOME/.local/share/jupyter/kernels/deno
+# COPY ./template/kernel/deno.json /usr/local/share/jupyter/kernels/deno/kernel.json
+
+# Copy non-root kernels
+COPY ./template/kernel/python3_user.json /usr/local/share/jupyter/kernels/python3_user/kernel.json
 
 # Create separate virtual environment for server
 RUN python -m venv $SERVER_PATH/.venv
@@ -62,10 +66,4 @@ WORKDIR $HOME
 COPY ./chart_data_extractor ./chart_data_extractor
 RUN pip install -e ./chart_data_extractor
 
-# Set ownership of all files to the user
-RUN chown -R user:user $HOME
-
-# Switch to non-root user
-USER user
-
 ENTRYPOINT $JUPYTER_CONFIG_PATH/start-up.sh