qip

Author: mishushakov

template/kernel/python3_user.json template/kernel/python3_sudo.jsontemplate/kernel/python3_user.json renamed to template/kernel/python3_sudo.json

@@ -1,8 +1,6 @@
 {
     "argv": [
      "sudo",
-     "-u",
-     "user",
      "/usr/local/bin/python",
      "-m",
      "ipykernel_launcher",

template/server/main.py

@@ -34,14 +34,14 @@ async def lifespan(app: FastAPI):
     global client
     client = httpx.AsyncClient()
 
-    with open("/root/.jupyter/kernel_id") as file:
+    with open("/home/user/.jupyter/kernel_id") as file:
         default_context_id = file.read().strip()
 
     default_ws = ContextWebSocket(
         default_context_id,
         str(uuid.uuid4()),
         "python",
-        "/root",
+        "/home/user",
     )
     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": "/root", "kernel": {"name": "python3"}, "type": "notebook", "name": "default"}')
+	response=$(curl -s -X POST "localhost:8888/api/sessions" -H "Content-Type: application/json" -d '{"path": "'$HOME'", "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 /root/.jupyter
+	mkdir -p $HOME/.jupyter
 	kernel_id=$(echo "${response}" | jq -r '.kernel.id')
-	echo "${kernel_id}" > /root/.jupyter/kernel_id
-	echo "${response}" > /root/.jupyter/.session_info
+	echo "${kernel_id}" > $HOME/.jupyter/kernel_id
+	echo "${response}" > $HOME/.jupyter/.session_info
 
-	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
+	cd $HOME/.server/
+	$HOME/.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=/root/.config/matplotlib/.matplotlibrc jupyter server --IdentityProvider.token=""
+MATPLOTLIBRC=$HOME/.config/matplotlib/.matplotlibrc jupyter server --IdentityProvider.token=""

template/test.Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.10.14
 
-ENV HOME=/root
+ENV HOME=/home/user
 
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:11-jdk $JAVA_HOME $JAVA_HOME
@@ -13,9 +13,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-ins
 RUN useradd -m -s /bin/bash user && \
   echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
   echo 'user:password' | chpasswd && \
-  usermod -aG sudo user && \
-  chmod -R o+rx /root && \
-  chown -R user:user /root
+  usermod -aG sudo user
 
 ENV PIP_DEFAULT_TIMEOUT=100 \
   PIP_DISABLE_PIP_VERSION_CHECK=1 \
@@ -40,10 +38,9 @@ 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
+# Copy sudo kernels
+COPY ./template/kernel/python3_sudo.json /usr/local/share/jupyter/kernels/python3_sudo/kernel.json
 
 # Create separate virtual environment for server
 RUN python -m venv $SERVER_PATH/.venv
@@ -74,4 +71,8 @@ WORKDIR $HOME
 COPY ./chart_data_extractor ./chart_data_extractor
 RUN pip install -e ./chart_data_extractor
 
+# Change ownership of all files to user
+RUN chown -R user:user $HOME
+
+USER user
 ENTRYPOINT $JUPYTER_CONFIG_PATH/start-up.sh