Update Dockerfile

Dockerfile

@@ -4,27 +4,45 @@ FROM python:3.10-slim
 # Set working directory
 WORKDIR /app
 
-# Install necessary dependencies
-RUN apt-get update && apt-get install -y git
-
+# --- Install System Dependencies ---
+# Includes git (for cloning) AND R + R Development tools (for rpy2 and R packages)
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    r-base \
+    r-base-dev \
+    && rm -rf /var/lib/apt/lists/* # Clean up apt cache
+
+# --- Install Required R Packages ---
+# Install the R packages needed by your R model.
+# *** Modify c('randomForest') if your model depends on other R packages ***
+RUN Rscript -e "install.packages(c('randomForest'), repos='https://cloud.r-project.org/', dependencies=TRUE)" \
+    || (echo "R PACKAGE INSTALLATION FAILED" && exit 1) # Basic error check
+
+# --- Python Setup ---
 # Upgrade pip to the latest version
 RUN pip install --upgrade pip
 
-# Create necessary directories and set permissions
+# Create necessary directories and set permissions (keeping user's original)
 RUN mkdir -p /app && chmod -R 777 /app
 
-# Clone private repository using mounted secret
+# --- Application Code ---
+# Clone private repository using mounted secret (keeping user's original)
 RUN --mount=type=secret,id=GITHUB_TOKEN,mode=0444,required=true \
-    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/leoncool23/pdpredict.git .
+    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/leoncool23/pdpredict.git . \
+    || (echo "GIT CLONE FAILED!" && exit 1) # Basic error check
 
-# Copy the static directory into the container
+# Copy the static directory into the container (keeping user's original)
+# Make sure the 'static' directory is available in the build context.
 COPY static /app/static
 
-# Install Python dependencies
-RUN pip install --no-cache-dir -r requirements.txt
+# --- Install Python Dependencies ---
+# This MUST run after R is installed so rpy2 can configure correctly.
+# Assumes requirements.txt was cloned via git and includes rpy2.
+RUN pip install --no-cache-dir -r requirements.txt \
+    || (echo "PIP INSTALL FAILED!" && exit 1) # Basic error check
 
-# Expose the port for FastAPI
+# Expose the port for FastAPI (keeping user's original)
 EXPOSE 7860
 
-# Run the FastAPI app with uvicorn
+# Run the FastAPI app with uvicorn (keeping user's original)
 CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]