Update Dockerfile

Dockerfile

@@ -1,19 +1,27 @@
 # MCP-Compliant Dockerfile for Hugging Face Spaces deployment of Coral Server
+
+# ==============================================================================
+# Build Stage: Compile the Coral Server application
+# ==============================================================================
 FROM gradle:8.5-jdk21 AS build
 
+# Set working directory
 WORKDIR /app
 
 # Clone the Coral Server repository
 RUN git clone https://github.com/Coral-Protocol/coral-server.git .
 
-# Build the application
+# Build the application, skipping tests to speed up the build
 RUN gradle build --no-daemon -x test
 
-# Create configuration files
-RUN mkdir -p /coral-config && \
-    if [ ! -f src/main/resources/application.yaml ]; then \
+# Create configuration directory
+RUN mkdir -p /coral-config
+
+# Copy default configs if they exist, otherwise create minimal ones.
+# Note: The server port here is set to 7860, but it will be overridden at runtime.
+RUN if [ ! -f src/main/resources/application.yaml ]; then \
         echo "server:" > /coral-config/application.yaml && \
-        echo "  port: 5555" >> /coral-config/application.yaml && \
+        echo "  port: 7860" >> /coral-config/application.yaml && \
         echo "mcp:" >> /coral-config/application.yaml && \
         echo "  transport: sse" >> /coral-config/application.yaml; \
     else \
@@ -25,131 +33,84 @@ RUN mkdir -p /coral-config && \
         cp src/main/resources/registry.toml /coral-config/; \
     fi
 
-# Runtime stage
+# ==============================================================================
+# Runtime Stage: Set up the final container with Nginx and the Java app
+# ==============================================================================
 FROM openjdk:21-jdk-slim
 
-# Install required packages
+# Install Nginx for reverse proxying
 RUN apt-get update && apt-get install -y \
     curl \
-    git \
     nginx \
     && rm -rf /var/lib/apt/lists/*
 
+# Set working directory
 WORKDIR /app
 
-# Copy built application from build stage
+# Copy built application and configs from the build stage
 COPY --from=build /app/build/libs/*.jar app.jar
-COPY --from=build /app/build /app/build
 COPY --from=build /coral-config /app/coral-config
-COPY --from=build /app/gradlew /app/gradlew
-COPY --from=build /app/gradle /app/gradle
-
-# Create user first (before modifying files)
-RUN useradd -m -u 1000 user
-
-# Configure nginx for non-root operation
-RUN mkdir -p /var/cache/nginx /var/log/nginx /var/lib/nginx /var/run && \
-    chown -R user:user /var/cache/nginx /var/log/nginx /var/lib/nginx /var/run && \
-    chmod -R 755 /var/cache/nginx /var/log/nginx /var/lib/nginx /var/run
-
-# Create nginx config that works with non-root user
-RUN echo 'daemon off;' > /etc/nginx/nginx.conf && \
-    echo 'user user;' >> /etc/nginx/nginx.conf && \
-    echo 'worker_processes 1;' >> /etc/nginx/nginx.conf && \
-    echo 'error_log /var/log/nginx/error.log warn;' >> /etc/nginx/nginx.conf && \
-    echo 'pid /var/run/nginx.pid;' >> /etc/nginx/nginx.conf && \
-    echo '' >> /etc/nginx/nginx.conf && \
-    echo 'events {' >> /etc/nginx/nginx.conf && \
-    echo '    worker_connections 1024;' >> /etc/nginx/nginx.conf && \
-    echo '}' >> /etc/nginx/nginx.conf && \
-    echo '' >> /etc/nginx/nginx.conf && \
-    echo 'http {' >> /etc/nginx/nginx.conf && \
-    echo '    include /etc/nginx/mime.types;' >> /etc/nginx/nginx.conf && \
-    echo '    default_type application/octet-stream;' >> /etc/nginx/nginx.conf && \
-    echo '    sendfile on;' >> /etc/nginx/nginx.conf && \
-    echo '    keepalive_timeout 65;' >> /etc/nginx/nginx.conf && \
-    echo '' >> /etc/nginx/nginx.conf && \
-    echo '    server {' >> /etc/nginx/nginx.conf && \
-    echo '        listen 7860;' >> /etc/nginx/nginx.conf && \
-    echo '        server_name _;' >> /etc/nginx/nginx.conf && \
-    echo '' >> /etc/nginx/nginx.conf && \
-    echo '        # Root endpoint' >> /etc/nginx/nginx.conf && \
-    echo '        location = / {' >> /etc/nginx/nginx.conf && \
-    echo '            return 200 "Coral Server is running";' >> /etc/nginx/nginx.conf && \
-    echo '            add_header Content-Type text/plain;' >> /etc/nginx/nginx.conf && \
-    echo '        }' >> /etc/nginx/nginx.conf && \
-    echo '' >> /etc/nginx/nginx.conf && \
-    echo '        # SSE endpoint for MCP' >> /etc/nginx/nginx.conf && \
-    echo '        location /devmode/ {' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_pass http://127.0.0.1:5555;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_http_version 1.1;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header Upgrade $http_upgrade;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header Connection "";' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header Host $host;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header X-Real-IP $remote_addr;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header X-Forwarded-Proto $scheme;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_buffering off;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_cache off;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_read_timeout 86400;' >> /etc/nginx/nginx.conf && \
-    echo '            chunked_transfer_encoding off;' >> /etc/nginx/nginx.conf && \
-    echo '        }' >> /etc/nginx/nginx.conf && \
-    echo '' >> /etc/nginx/nginx.conf && \
-    echo '        # General proxy for other endpoints' >> /etc/nginx/nginx.conf && \
-    echo '        location / {' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_pass http://127.0.0.1:5555;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_http_version 1.1;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header Host $host;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header X-Real-IP $remote_addr;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> /etc/nginx/nginx.conf && \
-    echo '            proxy_set_header X-Forwarded-Proto $scheme;' >> /etc/nginx/nginx.conf && \
-    echo '        }' >> /etc/nginx/nginx.conf && \
-    echo '    }' >> /etc/nginx/nginx.conf && \
-    echo '}' >> /etc/nginx/nginx.conf
-
-# Create startup script
+
+# Create Nginx config to proxy requests from public port 7860 to the internal Coral Server port 5555
+RUN echo 'server {' > /etc/nginx/sites-available/mcp-proxy && \
+    echo '    listen 7860;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '    server_name localhost;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '    # Proxy all locations to the Coral Server' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '    location / {' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_pass http://127.0.0.1:5555;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_http_version 1.1;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_set_header Upgrade $http_upgrade;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_set_header Connection "upgrade";' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_set_header Host $host;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_cache_bypass $http_upgrade;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_buffering off;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '        proxy_read_timeout 86400;' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '    }' >> /etc/nginx/sites-available/mcp-proxy && \
+    echo '}' >> /etc/nginx/sites-available/mcp-proxy && \
+    ln -s /etc/nginx/sites-available/mcp-proxy /etc/nginx/sites-enabled/ && \
+    rm /etc/nginx/sites-enabled/default
+
+# Create a startup script to run both Nginx and the Coral Server
 RUN echo '#!/bin/bash' > /app/start.sh && \
     echo 'set -e' >> /app/start.sh && \
     echo '' >> /app/start.sh && \
-    echo 'echo "Starting Coral Server on port 5555..."' >> /app/start.sh && \
-    echo 'cd /app' >> /app/start.sh && \
+    echo '# Start Nginx in the background, listening on port 7860' >> /app/start.sh && \
+    echo 'nginx -g "daemon off;" &' >> /app/start.sh && \
+    echo 'NGINX_PID=$!' >> /app/start.sh && \
     echo '' >> /app/start.sh && \
-    echo '# Start Coral Server with Gradle (using SSE Ktor server)' >> /app/start.sh && \
-    echo './gradlew run --args="--sse-server-ktor 5555" &' >> /app/start.sh && \
+    echo '# Start Coral Server, telling it to listen on internal port 5555' >> /app/start.sh && \
+    echo 'java -Xmx1g -Xms512m -jar app.jar --sse-server 5555 &' >> /app/start.sh && \
     echo 'CORAL_PID=$!' >> /app/start.sh && \
     echo '' >> /app/start.sh && \
-    echo '# Wait for Coral Server to start' >> /app/start.sh && \
-    echo 'sleep 10' >> /app/start.sh && \
-    echo '' >> /app/start.sh && \
-    echo '# Check if Coral Server is running' >> /app/start.sh && \
-    echo 'if ! ps -p $CORAL_PID > /dev/null; then' >> /app/start.sh && \
-    echo '    echo "Coral Server failed to start"' >> /app/start.sh && \
-    echo '    exit 1' >> /app/start.sh && \
-    echo 'fi' >> /app/start.sh && \
+    echo '# Wait for either process to exit' >> /app/start.sh && \
+    echo 'wait -n $NGINX_PID $CORAL_PID' >> /app/start.sh && \
     echo '' >> /app/start.sh && \
-    echo 'echo "Starting nginx on port 7860..."' >> /app/start.sh && \
-    echo 'nginx' >> /app/start.sh && \
+    echo '# Clean up both processes if one exits' >> /app/start.sh && \
+    echo 'kill $NGINX_PID $CORAL_PID 2>/dev/null || true' >> /app/start.sh && \
     chmod +x /app/start.sh
 
-# Set ownership
-RUN chown -R user:user /app && \
-    chown -R user:user /etc/nginx && \
-    chmod -R 755 /app
+# Create a non-root user as required by Hugging Face Spaces
+RUN useradd -m -u 1000 user && \
+    chown -R user:user /app && \
+    chown -R user:user /var/log/nginx && \
+    chown -R user:user /var/lib/nginx && \
+    touch /var/run/nginx.pid && \
+    chown user:user /var/run/nginx.pid
 
 USER user
 
 # Set environment variables
 ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH \
-    CONFIG_PATH=/app/coral-config/ \
-    GRADLE_USER_HOME=/home/user/.gradle
+    CONFIG_PATH=/app/coral-config/
 
-# HF Spaces expects port 7860
+# Expose the public port that Nginx is listening on
 EXPOSE 7860
 
-# Health check
+# Health check to ensure the service is running and accessible via the proxy
 HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
-    CMD curl -f http://localhost:7860/ || exit 1
+    CMD curl -f http://localhost:7860/devmode/exampleApplication/privkey/session1/sse || exit 1
 
-# Start both nginx proxy and Coral Server
+# Start the application using the script
 CMD ["/app/start.sh"]