combine docker

Dockerfile

@@ -0,0 +1,47 @@
+# Root-level Dockerfile
+
+# Stage 1: Build React frontend
+FROM node:18-alpine AS frontend-build
+
+WORKDIR /app/frontend
+
+COPY frontend/package.json frontend/package-lock.json ./
+RUN npm install
+
+COPY frontend/ ./
+RUN npm run build
+
+
+# Stage 2: Build Python backend + serve frontend with Nginx
+FROM python:3.9-slim
+
+WORKDIR /app
+
+# Install Python dependencies
+COPY backend/requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy backend code
+COPY backend/ /app/backend
+
+# Copy built frontend from previous stage
+COPY --from=frontend-build /app/frontend/build /app/frontend_build
+
+# Install nginx
+RUN apt-get update && apt-get install -y nginx && rm -rf /var/lib/apt/lists/*
+
+# Copy nginx config
+COPY frontend/nginx.conf /etc/nginx/conf.d/default.conf
+
+# Link built frontend to nginx root
+RUN rm -rf /usr/share/nginx/html && \
+    ln -s /app/frontend_build /usr/share/nginx/html
+
+# Copy script to run both frontend and backend
+COPY start.sh /start.sh
+RUN chmod +x /start.sh
+
+# Expose Hugging Face compatible port
+EXPOSE 7860
+
+CMD ["/start.sh"]

backend/Dockerfile

@@ -1,19 +0,0 @@
-FROM python:3.9-slim
-
-# Set the working directory in the container
-WORKDIR /app
-
-# Copy the requirements file and install dependencies
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-# Copy the rest of the backend application code
-COPY . .
-
-# Expose the port the app runs on
-EXPOSE 8000
-
-# Command to run the application
-# We use app_v2:app because your main FastAPI instance is in the app_v2.py file.
-# --host 0.0.0.0 makes the app accessible from outside the container.
-CMD ["uvicorn", "app_v2:app", "--host", "0.0.0.0", "--port", "8000"] 

docker-compose.yml

@@ -1,20 +0,0 @@
-version: '3.8'
-
-services:
-  backend:
-    build:
-      context: ./backend
-      dockerfile: Dockerfile
-    image: ca-study-assistant-backend
-    container_name: backend-container
-    restart: unless-stopped
-
-  frontend:
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile
-    image: ca-study-assistant-frontend
-    container_name: frontend-container
-    restart: unless-stopped
-    depends_on:
-      - backend # Ensures the backend starts before the frontend 

frontend/Dockerfile

@@ -1,34 +0,0 @@
-# Stage 1: Build the React application
-FROM node:18-alpine AS build
-
-WORKDIR /app
-
-# Copy package.json and package-lock.json
-COPY package.json package-lock.json ./
-
-# Install dependencies
-RUN npm install
-
-# Copy the rest of the application source code
-COPY . .
-
-# Build the application
-RUN npm run build
-
-# Stage 2: Serve the application with Nginx
-FROM nginx:1.23-alpine
-
-# Copy the build output from the build stage
-COPY --from=build /app/build /usr/share/nginx/html
-
-# Remove the default Nginx configuration
-RUN rm /etc/nginx/conf.d/default.conf
-
-# Copy our custom Nginx configuration
-COPY nginx.conf /etc/nginx/conf.d
-
-# Expose port 80
-EXPOSE 7860
-
-# Start Nginx
-CMD ["nginx", "-g", "daemon off;"] 

start.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Run backend (FastAPI via Uvicorn) in background
+uvicorn backend.app_v2:app --host 0.0.0.0 --port 8000 &
+
+# Start Nginx to serve frontend
+nginx -g "daemon off;"