Update Dockerfile

Dockerfile

@@ -1,45 +1,63 @@
-# Use the official FEniCS Docker image as the base
-FROM quay.io/fenicsproject/stable:latest
+# Use an official Ubuntu base image
+FROM ubuntu:22.04
 
-# Set environment variables to prevent interactive prompts during installation
+# Prevent interactive prompts during package installation
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Update package lists and install necessary system dependencies
-RUN apt-get update && apt-get install -y \
-    python3-pip \
-    python3-dev \
+# Set environment variables
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
+
+# Install system dependencies and add FEniCS PPA
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    software-properties-common \
     build-essential \
-    libgl1-mesa-glx \
-    libglib2.0-0 \
+    cmake \
+    git \
+    ffmpeg \
+    git-lfs \
+    curl \
+    nodejs \
+    python3.10 \
+    python3.10-venv \
+    python3-pip \
+    && add-apt-repository ppa:fenics-packages/fenics -y \
+    && apt-get update \
+    && apt-get install -y fenicsx \
     && rm -rf /var/lib/apt/lists/*
 
-# Upgrade pip to the latest version
-RUN pip3 install --upgrade pip
+# Verify FEniCSx installation
+RUN python3.10 -c "import dolfinx; print('FEniCSx version:', dolfinx.__version__)"
 
-# Install Python dependencies
-RUN pip3 install --no-cache-dir \
-    gradio \
-    pandas \
-    numpy \
-    scikit-learn \
-    sympy \
-    matplotlib
+# Upgrade pip and install Python packages
+RUN python3.10 -m pip install --upgrade pip
 
-# Create a directory for the application
-WORKDIR /app
+# Set work directory
+WORKDIR /home/user/app
 
-# Copy the application code into the Docker image
-COPY app.py /app/
+# Copy requirements file
+COPY requirements.txt /tmp/requirements.txt
 
-# (Optional) If you have additional files like requirements.txt, include them
-# COPY requirements.txt /app/
+# Install Python packages from requirements.txt
+RUN python3.10 -m pip install --no-cache-dir -r /tmp/requirements.txt
 
-# Expose the port that Gradio will run on
-EXPOSE 7860
+# Install additional Python packages
+RUN python3.10 -m pip install --no-cache-dir \
+    gradio[oauth]==5.9.1 \
+    "uvicorn>=0.14.0" \
+    spaces
 
-# Set environment variables for Gradio to ensure it listens on all network interfaces
-ENV GRADIO_SERVER_NAME=0.0.0.0
-ENV GRADIO_SERVER_PORT=7860
+# Update pip to the latest version after all installations
+RUN python3.10 -m pip install --upgrade pip
+
+# Copy the application code
+COPY --chown=1000:1000 ./ /home/user/app
+
+# Freeze installed packages (optional)
+RUN python3.10 -m pip freeze > /tmp/freeze.txt
+
+# Expose the port the app runs on (modify if necessary)
+EXPOSE 7860
 
-# Define the command to run the application
-CMD ["python3", "app.py"]
+# Define the default command to run the application
+CMD ["python3.10", "app.py"]