🐳 Update Dockerfile

Dockerfile

@@ -1,25 +1,144 @@
-# Backend-only Dockerfile for Hugging Face Spaces
-# This deploys ONLY the Spring Boot backend on port 7860
-# Frontend will be added later once build issue is resolved
+# Multi-stage Dockerfile for Hugging Face Spaces deployment
+# Combines frontend and backend into a single container
 
+# ============================================
+# Stage 1: Build Frontend
+# ============================================
+FROM node:20 AS frontend-builder
+
+WORKDIR /app/frontend
+
+# Copy frontend package files
+COPY frontend/package*.json ./
+
+# Install dependencies
+RUN npm install --legacy-peer-deps
+
+# Copy frontend source
+COPY frontend/ ./
+
+# Set build-time environment variable for API URL
+# Empty string because frontend services already include /api prefix in their calls
+ARG VITE_API_BASE_URL=
+ENV VITE_API_BASE_URL=$VITE_API_BASE_URL
+
+# Build frontend with error checking
+RUN echo "=== Building frontend with Vite ===" && \
+    npm run build 2>&1 | tee /tmp/build.log && \
+    echo "=== Build complete ===" && \
+    echo "=== Verifying build output ===" && \
+    ls -laR dist/ && \
+    echo "=== Checking assets folder ===" && \
+    ls -la dist/assets/ && \
+    ASSET_COUNT=$(find dist/assets -type f | wc -l) && \
+    echo "Assets folder contains $ASSET_COUNT files" && \
+    if [ "$ASSET_COUNT" -lt 1 ]; then \
+        echo "ERROR: Frontend build failed - no assets generated!" && \
+        echo "=== Build log ===" && \
+        cat /tmp/build.log && \
+        exit 1; \
+    fi && \
+    echo "=== Frontend build verification passed ==="
+
+# ============================================
+# Stage 2: Build Backend
+# ============================================
+FROM maven:3.9.6-eclipse-temurin-17 AS backend-builder
+
+WORKDIR /app/backend
+
+# Copy pom.xml first for dependency caching
+COPY backend/pom.xml ./
+
+# Download dependencies
+RUN mvn dependency:go-offline -B
+
+# Copy backend source
+COPY backend/src ./src
+
+# Build backend (skip tests for faster build)
+RUN mvn clean package -DskipTests
+
+# ============================================
+# Stage 3: Production Runtime
+# ============================================
 FROM eclipse-temurin:17-jre-jammy
 
 WORKDIR /app
 
-# Copy the pre-built backend JAR
-COPY backend/target/*.jar app.jar
+# Install nginx and diagnostic tools for serving frontend
+RUN apt-get update && \
+    apt-get install -y nginx curl netcat-openbsd net-tools && \
+    rm -rf /var/lib/apt/lists/*
+
+# Remove default nginx configuration to avoid conflicts
+RUN rm -f /etc/nginx/sites-enabled/default && \
+    rm -f /etc/nginx/sites-available/default
+
+# Copy built frontend from frontend-builder stage
+COPY --from=frontend-builder /app/frontend/dist /usr/share/nginx/html
 
-# Hugging Face Spaces requires port 7860
+# Verify frontend files were copied and fix permissions
+RUN echo "=== Verifying frontend build ===" && \
+    ls -la /usr/share/nginx/html && \
+    echo "=== File count: $(find /usr/share/nginx/html -type f | wc -l) ===" && \
+    chmod -R 755 /usr/share/nginx/html && \
+    chown -R root:root /usr/share/nginx/html
+
+# Copy nginx configuration directly to sites-available and enable it
+COPY frontend/nginx.conf /etc/nginx/sites-available/locallend.conf
+RUN ln -s /etc/nginx/sites-available/locallend.conf /etc/nginx/sites-enabled/locallend.conf
+
+# Copy built backend JAR
+COPY --from=backend-builder /app/backend/target/*.jar /app/backend.jar
+
+# Create a startup script using echo to avoid heredoc parsing issues
+RUN echo '#!/bin/bash' > /app/start.sh && \
+    echo 'set -e' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo 'echo "=== Starting LocalLend Application ==="' >> /app/start.sh && \
+    echo 'echo "=== Diagnostic Information ==="' >> /app/start.sh && \
+    echo 'echo "Hostname: $(hostname)"' >> /app/start.sh && \
+    echo 'echo "IP Address: $(hostname -i)"' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo '# Verify frontend files' >> /app/start.sh && \
+    echo 'echo "=== Frontend Files Check ==="' >> /app/start.sh && \
+    echo 'ls -la /usr/share/nginx/html/ | head -20' >> /app/start.sh && \
+    echo 'echo "Total files: $(find /usr/share/nginx/html -type f | wc -l)"' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo '# Test nginx configuration' >> /app/start.sh && \
+    echo 'echo "=== Testing nginx configuration ==="' >> /app/start.sh && \
+    echo 'nginx -t' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo '# Start nginx in background' >> /app/start.sh && \
+    echo 'echo "=== Starting nginx on 0.0.0.0:7860 ==="' >> /app/start.sh && \
+    echo 'nginx -g "daemon off;" &' >> /app/start.sh && \
+    echo 'NGINX_PID=$!' >> /app/start.sh && \
+    echo 'echo "Nginx started with PID: $NGINX_PID"' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo '# Wait for nginx to fully start' >> /app/start.sh && \
+    echo 'sleep 3' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo '# Verify nginx is running and responding' >> /app/start.sh && \
+    echo 'echo "=== Verifying nginx is responding ==="' >> /app/start.sh && \
+    echo 'ps aux | grep nginx | grep -v grep || echo "WARNING: nginx process not found!"' >> /app/start.sh && \
+    echo 'netstat -tulpn | grep :7860 || echo "WARNING: Port 7860 not listening!"' >> /app/start.sh && \
+    echo 'curl -s -o /dev/null -w "Localhost:7860 HTTP Status: %{http_code}\n" http://localhost:7860/health || echo "WARNING: Nginx not responding on localhost:7860!"' >> /app/start.sh && \
+    echo 'curl -s -o /dev/null -w "0.0.0.0:7860 HTTP Status: %{http_code}\n" http://0.0.0.0:7860/health || echo "WARNING: Nginx not responding on 0.0.0.0:7860!"' >> /app/start.sh && \
+    echo 'echo "=== Nginx verification complete ==="' >> /app/start.sh && \
+    echo '' >> /app/start.sh && \
+    echo '# Start Spring Boot application in foreground' >> /app/start.sh && \
+    echo 'echo "=== Starting Spring Boot on 0.0.0.0:8080 ==="' >> /app/start.sh && \
+    echo 'exec java -Dserver.address=0.0.0.0 -Dserver.port=8080 -jar /app/backend.jar' >> /app/start.sh && \
+    chmod +x /app/start.sh
+
+# Hugging Face Spaces expects the app to run on port 7860
+# Nginx will listen on 7860 and proxy to backend on 8080
 EXPOSE 7860
 
 # Set environment variables
-# Backend will run on port 7860 instead of 8080
-ENV SERVER_PORT=7860
+ENV SERVER_PORT=8080
 ENV SPRING_PROFILES_ACTIVE=prod
 
-# Health check endpoint for HF Spaces
-HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
-  CMD curl -f http://localhost:7860/api/categories || exit 1
-
-# Run the Spring Boot application
-ENTRYPOINT ["java", "-jar", "/app/app.jar"]
+# Start both nginx and Spring Boot
+CMD ["/app/start.sh"]