Update Dockerfile

Dockerfile

@@ -1,45 +1,44 @@
 # syntax=docker/dockerfile:1.4
 FROM python:3.10-slim
 
+# Set working directory
 WORKDIR /app
 
-# --- Install System Dependencies ---
-RUN apt-get update && apt-get install -y --no-install-recommends \
+# Install necessary dependencies including R and libraries for rpy2
+RUN apt-get update && apt-get install -y \
     git \
+    curl \
+    apt-transport-https \
+    ca-certificates \
+    gnupg \
+    lsb-release \
     r-base \
-    r-base-dev \
-    # May need additional system libraries for tidymodels dependencies, e.g.:
-    libcurl4-openssl-dev \
-    libssl-dev \
-    libxml2-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# --- Install Required R Packages ---
-# *** ADDED tidymodels package ***
-RUN Rscript -e "install.packages(c('randomForest', 'tidymodels'), repos='https://cloud.r-project.org/', dependencies=TRUE)" \
-    || (echo "R PACKAGE INSTALLATION FAILED" && exit 1)
-
-# --- Python Setup ---
+    r-cran-rpy2  # Install R and the rpy2 dependency for Python
+
+# Install R packages (if needed, such as data.table, caret, etc. for model handling)
+RUN R -e "install.packages('data.table')"  # Example, add other R dependencies if needed
+
+# Upgrade pip to the latest version
 RUN pip install --upgrade pip
 
-# Create directories and set permissions
+# Create necessary directories and set permissions
 RUN mkdir -p /app && chmod -R 777 /app
 
-# --- Application Code ---
+# Clone the private repository using the mounted secret (Ensure GITHUB_TOKEN is correctly set)
 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 . \
-    || (echo "GIT CLONE FAILED!" && exit 1)
+    git clone https://x-access-token:$(cat /run/secrets/GITHUB_TOKEN)@github.com/leoncool23/pdpredict.git .
 
-# Copy static directory
+# Copy static directory into the container (if exists)
 COPY static /app/static
 
-# --- Install Python Dependencies ---
-# Ensure requirements.txt includes rpy2, pandas, fastapi, uvicorn etc.
-RUN pip install --no-cache-dir -r requirements.txt \
-    || (echo "PIP INSTALL FAILED!" && exit 1)
+# Copy the necessary files for model loading and app execution
+COPY rf_model.rds /app/rf_model.rds  # Ensure that the .rds model is copied into the container
+
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
 
-# Expose port
+# Expose the port for FastAPI
 EXPOSE 7860
 
-# Run the FastAPI app
-CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]
+# Run the FastAPI app with uvicorn
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]