auto msg

Dockerfile

@@ -1,22 +1,18 @@
-FROM jupyter/scipy-notebook:latest
+FROM jupyter/scipy-notebook
 
 # Set the working directory to /app
 WORKDIR /app
 
-# Copy the requirements file and install Python dependencies
+# Copy the requirements file
 COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy static files
 COPY public /app/public
 
 # Switch to root user to install system packages and set permissions
 USER root
 
-# Install necessary dependencies
-RUN apt-get update && apt-get install -y \
-    nginx \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+# Install the dependencies
+RUN apt-get update && apt-get install -y wget nginx && pip install -r requirements.txt
 
 # Copy the configuration files and entrypoint script
 COPY jupyter_config.py /etc/jupyter/jupyter_config.py
@@ -26,23 +22,25 @@ COPY entrypoint.sh /app/entrypoint.sh
 # Set the entrypoint script as executable
 RUN chmod +x /app/entrypoint.sh
 
-# Create necessary directories and set permissions
-RUN mkdir -p /data /var/log/nginx /var/log/pods && \
-    chown -R ${NB_UID}:${NB_GID} /app /data /var/log/nginx /var/log/pods /etc/nginx/nginx.conf && \
-    chmod 755 /data
+# Set the permissions for the app directory to the existing user
+RUN chown -R ${NB_UID}:${NB_GID} /app
 
 # Switch back to the original user
 USER ${NB_UID}
 
 # Set the working directory for the user
-WORKDIR /data
+WORKDIR /home/${NB_USER}/app
 
-# Mount the secret
-RUN --mount=type=secret,id=JUPYTER_TOKEN,mode=0444,required=true \
-    cat /run/secrets/JUPYTER_TOKEN
+# Expose the port 8888 for JupyterLab
+EXPOSE 8888
 
-# Expose the port for Nginx
+# Expose the port 7860 for Nginx
 EXPOSE 7860
 
+# Set the environment variables
+ENV JUPYTERLAB_PORT=8888
+ENV JUPYTERLAB_TOKEN=your_secret_token
+ENV NGINX_PORT=7860
+
 # Run the entrypoint script when the container starts
 ENTRYPOINT ["/app/entrypoint.sh"]

entrypoint.sh

@@ -1,52 +1,14 @@
 #!/bin/bash
 
-# Function to handle errors
-handle_error() {
-    echo "Error: $1"
-    exit 1
-}
-
-# Verify and create the /data directory if it doesn't exist
-if [ ! -d "/data" ]; then
-    mkdir -p /data || handle_error "Could not create /data directory"
-    echo "/data directory created for persistent storage"
-fi
-
-# Verify write permissions for /data directory
-if [ ! -w "/data" ]; then
-    echo "Warning: No write permissions for /data. Some data may not be persistent."
-fi
-
-# Read JupyterLab token from the mounted secret file
-if [ -f "/run/secrets/JUPYTER_TOKEN" ]; then
-    export JUPYTER_TOKEN=$(cat /run/secrets/JUPYTER_TOKEN)
-else
-    echo "JUPYTER_TOKEN secret not found. Using AUX_TOKEN as fallback."
-    export JUPYTER_TOKEN=${AUX_TOKEN:-}
-fi
-
-# Verify if the token is empty
-if [ -z "$JUPYTER_TOKEN" ]; then
-    handle_error "JupyterLab token is empty"
-fi
-
-# Check for GPU availability
-if command -v nvidia-smi &> /dev/null; then
-    echo "GPU detected. Configuring environment for GPU usage."
-    export NVIDIA_VISIBLE_DEVICES=all
-    export NVIDIA_DRIVER_CAPABILITIES=compute,utility
-else
-    echo "No GPU detected. CPU will be used."
-fi
+# Read the JupyterLab token from the HF secret
+JUPYTERLAB_TOKEN=$(cat /run/secrets/JUPYTER_TOKEN)
 
 # Start JupyterLab in the background
-jupyter lab --ip=0.0.0.0 --port=${JUPYTERLAB_PORT} --no-browser --allow-root \
-    --NotebookApp.token=${JUPYTER_TOKEN} \
-    --notebook-dir=/data &
+jupyter lab --ip=0.0.0.0 --port=${JUPYTERLAB_PORT} --no-browser --allow-root --NotebookApp.base_url=/jupyter --NotebookApp.token=${JUPYTERLAB_TOKEN} &
 
 # Ensure the Nginx PID file is writable
 touch /tmp/nginx.pid
 chmod 644 /tmp/nginx.pid
 
 # Start Nginx in the foreground
-nginx -g "daemon off;" -c /etc/nginx/nginx.conf || handle_error "Failed to start Nginx"
+nginx -g "daemon off;" -c /etc/nginx/nginx.conf

jupyter_config.py

@@ -1,11 +1,5 @@
-# Configuration file for jupyter-notebook.
-
-import os
-
 c.NotebookApp.ip = '0.0.0.0'
 c.NotebookApp.port = 8888
 c.NotebookApp.open_browser = False
-c.NotebookApp.notebook_dir = '/data'
 c.NotebookApp.allow_root = True
-c.NotebookApp.token = os.environ.get('JUPYTER_TOKEN')
-c.NotebookApp.base_url = '/jupyter'
+c.NotebookApp.token = 'your_secret_token'

nginx.conf

@@ -1,42 +1,17 @@
-worker_processes 1;
-pid /tmp/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    sendfile        on;
-    keepalive_timeout  65;
-
     server {
-        listen       7860;
-        server_name  localhost;
+        listen 7860;
+        server_name _;
 
-        # Serve static files from /app/public
         location / {
             root /app/public;
-            try_files $uri $uri/ =404;
+            index index.html;
         }
 
-        # Proxy JupyterLab to /jupyter/
         location /jupyter/ {
-            proxy_pass http://127.0.0.1:8888;
+            proxy_pass http://localhost:8888;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-
-            # WebSocket support
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
         }
-
-        error_log /tmp/nginx_error.log;
-        access_log /tmp/nginx_access.log;
     }
-}
+}