Update Dockerfile

Dockerfile

@@ -4,27 +4,47 @@ FROM python:3.10-slim
 # Set working directory
 WORKDIR /app
 
-# Install necessary dependencies
-RUN apt-get update && apt-get install -y git
-
-# Upgrade pip to the latest version
+# --- Install System Dependencies ---
+# Includes git (for cloning), R, and R development tools (needed for R packages/rpy2)
+# Add any other system libraries needed by specific R packages here (e.g., libcurl4-openssl-dev, libssl-dev)
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    r-base \
+    r-base-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# --- Install R Packages ---
+# Install the R packages required by your model.
+# *** Adjust the list c('randomForest') if your model needs other packages ***
+RUN Rscript -e "install.packages(c('randomForest'), repos='https://cloud.r-project.org/', dependencies=TRUE)"
+
+# --- Python Setup ---
+# Upgrade pip
 RUN pip install --upgrade pip
 
-# Create necessary directories and set permissions
-RUN mkdir -p /app && chmod -R 777 /app
+# Create app directory (redundant with WORKDIR, but harmless) and set permissions
+# Using 755 is generally safer than 777 unless specifically needed
+RUN mkdir -p /app && chmod -R 755 /app
+WORKDIR /app # Ensure we are in the workdir
 
+# --- Application Code ---
 # Clone private repository using mounted secret
+# This will bring in api.py, rf_model.rds, requirements.txt, etc.
 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 .
 
-# Copy the static directory into the container
-COPY static /app/static
-
-# Install Python dependencies
+# --- Install Python Dependencies ---
+# requirements.txt should be present after cloning
+# This MUST run *after* R is installed so rpy2 can find it
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Expose the port for FastAPI
-EXPOSE 7860
+# --- Port and Run Command ---
+# Expose the port your FastAPI app runs on (as defined in api.py or CMD)
+# Changed from 7860 to 8000 to match api.py standard uvicorn command
+EXPOSE 8000
 
-# Run the FastAPI app with uvicorn
-CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]
+# Run the FastAPI app defined in api.py using uvicorn
+# Corrected 'app:app' to 'api:app'
+# Corrected port from 7860 to 8000
+# If HF Spaces requires port 7860, change EXPOSE and --port back to 7860
+CMD ["uvicorn", "api:app", "--host", "0.0.0.0", "--port", "8000"]