Update Dockerfile

Dockerfile

@@ -1,14 +1,14 @@
-# Use an Ubuntu base image for compatibility with DOLFINx
+# Use an official Ubuntu base image
 FROM ubuntu:22.04
 
-# Set environment variables for non-interactive installation
+# Set non-interactive mode for apt
 ENV DEBIAN_FRONTEND=noninteractive
-ENV PATH="/opt/venv/bin:$PATH"
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
-# Install basic system dependencies
+# Install system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    software-properties-common \
     build-essential \
     cmake \
     g++ \
@@ -29,69 +29,67 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libscotch-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Install additional dependencies for PETSc and ParMETIS
+# Install PETSc dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libhypre-dev \
     libmumps-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Create a Python virtual environment
+# Create Python virtual environment
 RUN python3.10 -m venv /opt/venv
 
-# Upgrade pip and install Python dependencies
+# Activate virtual environment
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Upgrade pip and install Python packages
 RUN pip install --upgrade pip
+
+# Install mpi4py and additional Python packages
 RUN pip install numpy mpi4py cffi scikit-build-core[pyproject] petsc4py slepc4py
 
-# Clone and build Basix (required by DOLFINx)
+# Clone and build Basix (required by dolfinx)
 RUN git clone --branch main https://github.com/FEniCS/basix.git /tmp/basix && \
     mkdir -p /tmp/basix/build && cd /tmp/basix/build && \
     cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
     make -j$(nproc) && make install
 
-# Clone and build UFCx (required by DOLFINx)
+# Clone and build UFCx (required by dolfinx)
 RUN git clone --branch main https://github.com/FEniCS/ufcx.git /tmp/ufcx && \
     mkdir -p /tmp/ufcx/build && cd /tmp/ufcx/build && \
     cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
     make -j$(nproc) && make install
 
-# Clone and build DOLFINx (C++ core)
+# Clone and build dolfinx (C++ core and Python bindings)
 RUN git clone --branch main https://github.com/FEniCS/dolfinx.git /tmp/dolfinx && \
     mkdir -p /tmp/dolfinx/cpp/build && cd /tmp/dolfinx/cpp/build && \
     cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
-    make -j$(nproc) && make install
-
-# Install DOLFINx Python interface
-RUN cd /tmp/dolfinx/python && \
+    make -j$(nproc) && make install && \
+    cd /tmp/dolfinx/python && \
     pip install -r build-requirements.txt && \
     pip install --check-build-dependencies --no-build-isolation .
 
-# Verify DOLFINx installation
-RUN python -c "import dolfinx; print('DOLFINx version:', dolfinx.__version__)"
+# Verify dolfinx installation
+RUN python -c "import dolfinx; print('dolfinx version:', dolfinx.__version__)"
 
-# Clean up build files to reduce image size
+# Clean up build files
 RUN rm -rf /tmp/basix /tmp/ufcx /tmp/dolfinx
 
-# Copy requirements.txt and install additional Python packages
+# Install Gradio and other Python dependencies
 COPY requirements.txt /tmp/requirements.txt
 RUN pip install --no-cache-dir -r /tmp/requirements.txt
+RUN pip install --no-cache-dir gradio[oauth]==5.9.1 "uvicorn>=0.14.0" spaces matplotlib pandas
 
-# Install Gradio and other app-related dependencies
-RUN pip install --no-cache-dir \
-    gradio[oauth]==5.9.1 \
-    "uvicorn>=0.14.0" \
-    spaces
-
-# Freeze installed packages (optional)
+# Freeze installed Python packages (optional)
 RUN pip freeze > /tmp/freeze.txt
 
-# Set the working directory for the application
+# Set application working directory
 WORKDIR /home/user/app
 
-# Copy application code into the container
+# Copy application files
 COPY . /home/user/app
 
-# Expose the port for the application
+# Expose the Gradio app port
 EXPOSE 7860
 
-# Define the default command to run the application
-CMD ["python3.10", "app.py"]
+# Set default command to run the app
+CMD ["python", "app.py"]