auto msg

Dockerfile

@@ -1,10 +1,11 @@
-FROM jupyter/scipy-notebook
+FROM jupyter/scipy-notebook:latest
 
-# Set the working directory to /data
-WORKDIR /data
+# Set the working directory to /app
+WORKDIR /app
 
-# Copy the requirements file
+# Copy the requirements file and install Python dependencies
 COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
 
 # Copy static files
 COPY public /app/public
@@ -12,25 +13,11 @@ COPY public /app/public
 # Switch to root user to install system packages and set permissions
 USER root
 
-# Install sudo and other dependencies
+# Install necessary dependencies
 RUN apt-get update && apt-get install -y \
-    wget \
     nginx \
-    sudo \
-    build-essential \
-    curl \
-    git \
-    vim \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Install Python dependencies
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Add jovyan to sudoers
-RUN usermod -aG sudo jovyan && \
-    echo "jovyan ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jovyan && \
-    chmod 0440 /etc/sudoers.d/jovyan
-
 # Copy the configuration files and entrypoint script
 COPY jupyter_config.py /etc/jupyter/jupyter_config.py
 COPY nginx.conf /etc/nginx/nginx.conf
@@ -39,39 +26,22 @@ COPY entrypoint.sh /app/entrypoint.sh
 # Set the entrypoint script as executable
 RUN chmod +x /app/entrypoint.sh
 
-# Create necessary directories and set permissions for Nginx
-RUN mkdir -p /var/lib/nginx/body /var/lib/nginx/fastcgi \
-             /var/lib/nginx/proxy /var/lib/nginx/scgi \
-             /var/lib/nginx/uwsgi /var/log/nginx \
-    && chown -R ${NB_UID}:${NB_GID} /var/lib/nginx /var/log/nginx /var/run /run \
-    && chmod 755 /var/lib/nginx /var/run /run
-
-# Ensure Nginx has permissions to write to log directory and PID file
-RUN touch /var/log/nginx/error.log /var/log/nginx/access.log /run/nginx.pid \
-    && chown -R ${NB_UID}:${NB_GID} /var/log/nginx /run/nginx.pid
-
-# Create /data directory and set permissions
-RUN mkdir -p /data && chown -R ${NB_UID}:${NB_GID} /data
-
-# Handle the JUPYTER_TOKEN secret at build time
-RUN --mount=type=secret,id=JUPYTER_TOKEN,mode=0444,required=true \
-    echo "JUPYTER_TOKEN=$(cat /run/secrets/JUPYTER_TOKEN)" >> /etc/environment
+# Create necessary directories and set permissions
+RUN mkdir -p /data /var/log/nginx && \
+    chown -R ${NB_UID}:${NB_GID} /app /data /var/log/nginx /etc/nginx/nginx.conf && \
+    chmod 755 /data
 
 # Switch back to the original user
 USER ${NB_UID}
 
-# Set the working directory to /data
+# Set the working directory for the user
 WORKDIR /data
 
-# Expose the port 8888 for JupyterLab
-EXPOSE 8888
-
-# Expose the port 7860 for Nginx
+# Expose the port for Nginx
 EXPOSE 7860
 
 # Set the environment variables
 ENV JUPYTERLAB_PORT=8888
-ENV NGINX_PORT=7860
 
 # Run the entrypoint script when the container starts
 ENTRYPOINT ["/app/entrypoint.sh"]

entrypoint.sh

@@ -1,50 +1,43 @@
 #!/bin/bash
 
-# Función para manejar errores
+# Function to handle errors
 handle_error() {
     echo "Error: $1"
     exit 1
 }
 
-# Verificar y crear el directorio /data si no existe
+# Verify and create the /data directory if it doesn't exist
 if [ ! -d "/data" ]; then
-    mkdir -p /data || handle_error "No se pudo crear el directorio /data"
-    echo "Directorio /data creado para almacenamiento persistente"
+    mkdir -p /data || handle_error "Could not create /data directory"
+    echo "/data directory created for persistent storage"
 fi
 
-# Verificar permisos del directorio /data
+# Verify write permissions for /data directory
 if [ ! -w "/data" ]; then
-    echo "Advertencia: No se tienen permisos de escritura en /data. Algunos datos pueden no ser persistentes."
+    echo "Warning: No write permissions for /data. Some data may not be persistent."
 fi
 
-# Asegurar que el usuario jovyan sea el propietario de /data
-chown -R ${NB_UID}:${NB_GID} /data
+# Read JupyterLab token from HF secret
+JUPYTER_TOKEN=$(cat /run/secrets/JUPYTER_TOKEN)
 
-# Cargar el token de JupyterLab desde el archivo de entorno
-source /etc/environment
-
-# Verificar si el token está presente
+# Verify if the token is empty
 if [ -z "$JUPYTER_TOKEN" ]; then
-    handle_error "El token de JupyterLab está vacío. Asegúrate de configurar el secreto JUPYTER_TOKEN en la configuración del Space."
+    handle_error "JupyterLab token is empty"
 fi
 
-# Verificar disponibilidad de GPU
+# Check for GPU availability
 if command -v nvidia-smi &> /dev/null; then
-    echo "GPU detectada. Configurando entorno para uso de GPU."
+    echo "GPU detected. Configuring environment for GPU usage."
     export NVIDIA_VISIBLE_DEVICES=all
     export NVIDIA_DRIVER_CAPABILITIES=compute,utility
 else
-    echo "No se detectó GPU. Se utilizará CPU."
+    echo "No GPU detected. CPU will be used."
 fi
 
-# Iniciar JupyterLab en segundo plano
+# Start JupyterLab in the background
 jupyter lab --ip=0.0.0.0 --port=${JUPYTERLAB_PORT} --no-browser --allow-root \
-    --NotebookApp.base_url=/jupyter --NotebookApp.token=${JUPYTER_TOKEN} \
+    --NotebookApp.token=${JUPYTER_TOKEN} \
     --notebook-dir=/data &
 
-# Asegurar que el archivo PID de Nginx sea escribible
-touch /tmp/nginx.pid
-chmod 644 /tmp/nginx.pid
-
-# Iniciar Nginx en primer plano
-nginx -g "daemon off;" -c /etc/nginx/nginx.conf || handle_error "Fallo al iniciar Nginx"
+# Start Nginx in the foreground
+nginx -g "daemon off;" || handle_error "Failed to start Nginx"

jupyter_config.py

@@ -1,9 +1,11 @@
+# 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.base_url = '/jupyter'
-c.NotebookApp.token = os.environ.get('JUPYTERLAB_TOKEN', '')
-c.NotebookApp.notebook_dir = '/data'
+c.NotebookApp.token = os.environ.get('JUPYTER_TOKEN', '')
+c.NotebookApp.base_url = '/jupyter'

nginx.conf

@@ -1,12 +1,13 @@
-pid /tmp/nginx.pid;
+user $NB_UID;
 worker_processes 1;
+pid /tmp/nginx.pid;
 
 events {
     worker_connections 1024;
 }
 
 http {
-    include       mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
     sendfile        on;

requirements.txt

@@ -1 +1 @@
-jupyterlab
+jupyterlab==4.0.6