auto msg

Dockerfile

@@ -1,66 +1,73 @@
 FROM jupyter/scipy-notebook
 
-# Create a user with ID 1000
-RUN useradd -m -u 1000 user
+# Set the working directory to /data
+WORKDIR /data
 
-# Set environment variables
-ENV HOME=/home/user \
-    PATH=/home/user/.local/bin:$PATH
+# Copy the requirements file
+COPY requirements.txt .
 
-# Set working directory
-WORKDIR $HOME/app
+# Copy static files
+COPY public /app/public
 
-# Install system dependencies
+# Switch to root user to install system packages and set permissions
 USER root
+
+# Install sudo and other 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/*
 
-# Switch back to the user
-USER user
-
-# Upgrade pip
-RUN pip install --no-cache-dir --upgrade pip
-
-# Copy requirements and install Python dependencies
-COPY --chown=user requirements.txt .
-RUN pip install --user --no-cache-dir -r requirements.txt
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy static files
-COPY --chown=user public $HOME/app/public
+# 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 configuration files
-COPY --chown=user jupyter_config.py $HOME/.jupyter/jupyter_config.py
-COPY --chown=user nginx.conf $HOME/nginx.conf
-COPY --chown=user entrypoint.sh $HOME/entrypoint.sh
+# Copy the configuration files and entrypoint script
+COPY jupyter_config.py /etc/jupyter/jupyter_config.py
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY entrypoint.sh /app/entrypoint.sh
 
-# Make entrypoint executable
-RUN chmod +x $HOME/entrypoint.sh
+# Set the entrypoint script as executable
+RUN chmod +x /app/entrypoint.sh
 
-# Create necessary directories for Nginx
-USER root
+# 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 user:user /var/lib/nginx /var/log/nginx /var/run /run \
+    && chown -R ${NB_UID}:${NB_GID} /var/lib/nginx /var/log/nginx /var/run /run \
     && chmod 755 /var/lib/nginx /var/run /run
 
-# Create Nginx log files
-RUN touch /var/log/nginx/error.log /var/log/nginx/access.log \
-    && chown user:user /var/log/nginx/error.log /var/log/nginx/access.log
+# 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
+
+# Switch back to the original user
+USER ${NB_UID}
 
-# Create a directory for persistent data
-RUN mkdir -p /data && chown user:user /data && chmod 777 /data
+# Set the working directory to /data
+WORKDIR /data
 
-USER user
+# Expose the port 8888 for JupyterLab
+EXPOSE 8888
 
-# Expose ports
-EXPOSE 8888 7860
+# Expose the port 7860 for Nginx
+EXPOSE 7860
 
-# Set environment variables
-ENV JUPYTERLAB_PORT=8888 \
-    NGINX_PORT=7860
+# Set the environment variables
+ENV JUPYTERLAB_PORT=8888
+ENV NGINX_PORT=7860
 
-# Run the entrypoint script
-ENTRYPOINT ["$HOME/entrypoint.sh"]
+# Run the entrypoint script when the container starts
+ENTRYPOINT ["/app/entrypoint.sh"]

entrypoint.sh

@@ -1,14 +1,50 @@
 #!/bin/bash
 
-# Read the JupyterLab token from the HF secret
+# Función para manejar errores
+handle_error() {
+    echo "Error: $1"
+    exit 1
+}
+
+# Verificar y crear el directorio /data si no existe
+if [ ! -d "/data" ]; then
+    mkdir -p /data || handle_error "No se pudo crear el directorio /data"
+    echo "Directorio /data creado para almacenamiento persistente"
+fi
+
+# Verificar permisos del directorio /data
+if [ ! -w "/data" ]; then
+    echo "Advertencia: No se tienen permisos de escritura en /data. Algunos datos pueden no ser persistentes."
+fi
+
+# Asegurar que el usuario jovyan sea el propietario de /data
+chown -R ${NB_UID}:${NB_GID} /data
+
+# Leer el token de JupyterLab del secreto de HF
 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.base_url=/jupyter --NotebookApp.token=${JUPYTERLAB_TOKEN} &
+# Verificar si el token está vacío
+if [ -z "$JUPYTERLAB_TOKEN" ]; then
+    handle_error "El token de JupyterLab está vacío"
+fi
+
+# Verificar disponibilidad de GPU
+if command -v nvidia-smi &> /dev/null; then
+    echo "GPU detectada. Configurando entorno para uso de GPU."
+    export NVIDIA_VISIBLE_DEVICES=all
+    export NVIDIA_DRIVER_CAPABILITIES=compute,utility
+else
+    echo "No se detectó GPU. Se utilizará CPU."
+fi
+
+# Iniciar JupyterLab en segundo plano
+jupyter lab --ip=0.0.0.0 --port=${JUPYTERLAB_PORT} --no-browser --allow-root \
+    --NotebookApp.base_url=/jupyter --NotebookApp.token=${JUPYTERLAB_TOKEN} \
+    --notebook-dir=/data &
 
-# Ensure the Nginx PID file is writable
+# Asegurar que el archivo PID de Nginx sea escribible
 touch /tmp/nginx.pid
 chmod 644 /tmp/nginx.pid
 
-# Start Nginx in the foreground
-nginx -g "daemon off;" -c /etc/nginx/nginx.conf
+# Iniciar Nginx en primer plano
+nginx -g "daemon off;" -c /etc/nginx/nginx.conf || handle_error "Fallo al iniciar Nginx"

jupyter_config.py

@@ -5,4 +5,5 @@ c.NotebookApp.port = 8888
 c.NotebookApp.open_browser = False
 c.NotebookApp.allow_root = True
 c.NotebookApp.base_url = '/jupyter'
-c.NotebookApp.token = os.environ.get('JUPYTERLAB_TOKEN', '')
+c.NotebookApp.token = os.environ.get('JUPYTERLAB_TOKEN', '')
+c.NotebookApp.notebook_dir = '/data'