Update Dockerfile

Dockerfile

@@ -1,73 +1,172 @@
-# Dockerfile for Agenta on Hugging Face Spaces
-# Multi-stage build to handle the complex service architecture
+# Agenta on Hugging Face Spaces - Multi-service setup without DinD
+# Uses official Agenta images directly
 
-FROM docker:24-dind AS base
+FROM ghcr.io/agenta-ai/agenta-api:latest AS api
 
-# Install required dependencies
-RUN apk add --no-cache \
-    git \
-    curl \
-    bash \
-    python3 \
-    py3-pip \
-    nodejs \
-    npm \
-    postgresql-client \
-    redis
+# Switch to root to install additional services
+USER root
 
-# Set working directory
+# Install Node.js for web service, PostgreSQL, Redis, and other deps
+RUN apt-get update && apt-get install -y \
+    curl \
+    gnupg \
+    postgresql \
+    postgresql-contrib \
+    redis-server \
+    nginx \
+    supervisor \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
+# Setup PostgreSQL
+RUN service postgresql start && \
+    su - postgres -c "psql -c \"CREATE USER agenta WITH PASSWORD 'agenta';\"" && \
+    su - postgres -c "psql -c \"CREATE DATABASE agenta OWNER agenta;\"" && \
+    su - postgres -c "psql -c \"ALTER USER agenta WITH SUPERUSER;\""
+
+# Setup Redis
+RUN mkdir -p /var/run/redis && chmod 777 /var/run/redis
+
+# Copy web assets from web image (multi-stage)
+FROM ghcr.io/agenta-ai/agenta-web:latest AS web-builder
 WORKDIR /app
+# Web assets are already in /app in this image
 
-# Clone Agenta repository (shallow clone for faster build)
-RUN git clone --depth 1 https://github.com/Agenta-AI/agenta.git .
+# Final stage - combine everything
+FROM ghcr.io/agenta-ai/agenta-api:latest
 
-# Copy environment configuration
-RUN cp hosting/docker-compose/oss/env.oss.gh.example hosting/docker-compose/oss/.env.oss.gh
+USER root
 
-# Modify environment for Hugging Face Spaces (port 7860)
-RUN sed -i 's/TRAEFIK_PORT=80/TRAEFIK_PORT=7860/g' hosting/docker-compose/oss/.env.oss.gh && \
-    sed -i 's|AGENTA_SERVICES_URL=http://localhost:80/services|AGENTA_SERVICES_URL=http://localhost:7860/services|g' hosting/docker-compose/oss/.env.oss.gh && \
-    sed -i 's|AGENTA_API_URL=http://localhost:80/api|AGENTA_API_URL=http://localhost:7860/api|g' hosting/docker-compose/oss/.env.oss.gh && \
-    sed -i 's|AGENTA_WEB_URL=http://localhost:80|AGENTA_WEB_URL=http://localhost:7860|g' hosting/docker-compose/oss/.env.oss.gh
-
-# Install Docker Compose
-RUN pip3 install docker-compose
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+    postgresql-client \
+    redis-tools \
+    nginx \
+    supervisor \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy web service from web image
+COPY --from=web-builder /app /app/web
+
+# Setup environment variables for Hugging Face Spaces
+ENV PORT=7860
+ENV HOSTNAME=0.0.0.0
+ENV AGENTA_MODE=oss
+
+# Database configuration (using SQLite for simplicity in single container)
+ENV DATABASE_URL=sqlite:////app/data/agenta.db
+ENV REDIS_URL=redis://localhost:6379/0
+
+# API configuration
+ENV AGENTA_API_URL=http://localhost:7860/api
+ENV AGENTA_WEB_URL=http://localhost:7860
+ENV AGENTA_SERVICES_URL=http://localhost:7860/services
+
+# Create necessary directories
+RUN mkdir -p /app/data /var/log/supervisor /run/postgresql
+
+# Supervisor configuration to manage multiple processes
+RUN cat > /etc/supervisor/conf.d/supervisord.conf << 'EOF'
+[supervisord]
+nodaemon=true
+user=root
+
+[program:postgres]
+command=/usr/lib/postgresql/15/bin/postgres -D /var/lib/postgresql/15/main -c config_file=/etc/postgresql/15/main/postgresql.conf
+autostart=true
+autorestart=true
+priority=1
+
+[program:redis]
+command=/usr/bin/redis-server --daemonize no --bind 0.0.0.0
+autostart=true
+autorestart=true
+priority=2
+
+[program:api]
+command=bash -c "sleep 10 && cd /app && uvicorn agenta_backend.main:app --host 0.0.0.0 --port 8080 --reload"
+autostart=true
+autorestart=true
+priority=3
+environment=DATABASE_URL="%(ENV_DATABASE_URL)s",REDIS_URL="%(ENV_REDIS_URL)s"
+
+[program:web]
+command=bash -c "sleep 15 && cd /app/web && node server.js"
+autostart=true
+autorestart=true
+priority=4
+environment=PORT="3000",API_URL="http://localhost:8080"
+
+[program:nginx]
+command=/usr/sbin/nginx -g 'daemon off;'
+autostart=true
+autorestart=true
+priority=5
+EOF
 
-# Expose Hugging Face Spaces default port
-EXPOSE 7860
+# Nginx configuration to route traffic
+RUN cat > /etc/nginx/sites-available/default << 'EOF'
+server {
+    listen 7860;
+    server_name localhost;
+
+    location / {
+        proxy_pass http://localhost:3000;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
+    }
+
+    location /api {
+        proxy_pass http://localhost:8080;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_cache_bypass $http_upgrade;
+    }
+}
+EOF
 
-# Create startup script
-RUN cat > /start.sh << 'EOF'
+# Initialize script
+RUN cat > /init.sh << 'EOF'
 #!/bin/bash
 set -e
 
-# Start Docker daemon in background
-dockerd &
+# Initialize PostgreSQL if not already done
+if [ ! -d "/var/lib/postgresql/15/main" ]; then
+    mkdir -p /var/lib/postgresql/15/main
+    chown -R postgres:postgres /var/lib/postgresql
+    su - postgres -c "/usr/lib/postgresql/15/bin/initdb -D /var/lib/postgresql/15/main"
+fi
+
+# Start PostgreSQL temporarily to create DB
+su - postgres -c "/usr/lib/postgresql/15/bin/pg_ctl -D /var/lib/postgresql/15/main -l /var/lib/postgresql/logfile start"
 sleep 5
 
-# Wait for Docker to be ready
-while ! docker info > /dev/null 2>&1; do
-    sleep 1
-done
+# Create database and user
+su - postgres -c "psql -c \"CREATE USER agenta WITH PASSWORD 'agenta';\" 2>/dev/null || true"
+su - postgres -c "psql -c \"CREATE DATABASE agenta OWNER agenta;\" 2>/dev/null || true"
+su - postgres -c "psql -c \"ALTER USER agenta WITH SUPERUSER;\" 2>/dev/null || true"
 
-# Navigate to app directory
-cd /app
+# Stop PostgreSQL (supervisor will start it properly)
+su - postgres -c "/usr/lib/postgresql/15/bin/pg_ctl -D /var/lib/postgresql/15/main stop" || true
 
-# Start Agenta services
-docker compose -f hosting/docker-compose/oss/docker-compose.gh.yml \
-    --env-file hosting/docker-compose/oss/.env.oss.gh \
-    --profile with-web \
-    up -d
+# Run database migrations
+sleep 5
 
-# Keep container running and show logs
-sleep 10
-docker logs -f agenta-oss-gh-web
+# Start all services via supervisor
+exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
 EOF
 
-RUN chmod +x /start.sh
+RUN chmod +x /init.sh
+
+EXPOSE 7860
 
-# Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
     CMD curl -f http://localhost:7860 || exit 1
 
-ENTRYPOINT ["/start.sh"]
+ENTRYPOINT ["/init.sh"]