Update Dockerfile

Dockerfile

@@ -1,164 +1,157 @@
-# Agenta on Hugging Face Spaces - Multi-service setup without DinD
-# Uses official Agenta images directly
+# Agenta on Hugging Face Spaces - Fixed version
+# Uses official Agenta images with SQLite instead of PostgreSQL
 
-FROM ghcr.io/agenta-ai/agenta-api:latest AS api
+FROM ghcr.io/agenta-ai/agenta-api:latest AS api-base
 
-# Switch to root to install additional services
 USER root
 
-# Install Node.js for web service, PostgreSQL, Redis, and other deps
+# Install Python dependencies for SQLite and other tools
 RUN apt-get update && apt-get install -y \
-    curl \
-    gnupg \
-    postgresql \
-    postgresql-contrib \
+    sqlite3 \
     redis-server \
     nginx \
     supervisor \
-    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y nodejs \
+    curl \
     && 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 directories
+RUN mkdir -p /app/data /var/log/supervisor /var/run/redis
 
-# 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
+# Copy web assets from web image
+FROM ghcr.io/agenta-ai/agenta-web:latest AS web-source
 WORKDIR /app
-# Web assets are already in /app in this image
 
-# Final stage - combine everything
-FROM ghcr.io/agenta-ai/agenta-api:latest
+# Final stage
+FROM api-base
 
-USER root
+# Copy web files
+COPY --from=web-source /app /app/web
 
-# 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
+# Setup environment for SQLite and single container
 ENV PORT=7860
 ENV HOSTNAME=0.0.0.0
 ENV AGENTA_MODE=oss
 
-# Database configuration (using SQLite for simplicity in single container)
+# Use SQLite instead of PostgreSQL
 ENV DATABASE_URL=sqlite:////app/data/agenta.db
 ENV REDIS_URL=redis://localhost:6379/0
 
-# API configuration
+# API and Web URLs
 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
+# Additional config for Agenta
+ENV ENVIRONMENT=production
+ENV FEATURE_FLAG=oss
 
-# Supervisor configuration to manage multiple processes
+# Create supervisor config
 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
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
 
 [program:redis]
-command=/usr/bin/redis-server --daemonize no --bind 0.0.0.0
+command=/usr/bin/redis-server --daemonize no --bind 127.0.0.1 --port 6379
 autostart=true
 autorestart=true
-priority=2
+priority=1
+stdout_logfile=/var/log/supervisor/redis.log
+stderr_logfile=/var/log/supervisor/redis.err
 
 [program:api]
-command=bash -c "sleep 10 && cd /app && uvicorn agenta_backend.main:app --host 0.0.0.0 --port 8080 --reload"
+command=bash -c "sleep 5 && cd /app && uvicorn agenta_backend.main:app --host 0.0.0.0 --port 8080"
+directory=/app
 autostart=true
 autorestart=true
-priority=3
-environment=DATABASE_URL="%(ENV_DATABASE_URL)s",REDIS_URL="%(ENV_REDIS_URL)s"
+priority=2
+stdout_logfile=/var/log/supervisor/api.log
+stderr_logfile=/var/log/supervisor/api.err
+environment=DATABASE_URL="%(ENV_DATABASE_URL)s",REDIS_URL="%(ENV_REDITS_URL)s",ENVIRONMENT="production"
 
 [program:web]
-command=bash -c "sleep 15 && cd /app/web && node server.js"
+command=bash -c "sleep 10 && cd /app/web && npm start"
+directory=/app/web
 autostart=true
 autorestart=true
-priority=4
-environment=PORT="3000",API_URL="http://localhost:8080"
+priority=3
+stdout_logfile=/var/log/supervisor/web.log
+stderr_logfile=/var/log/supervisor/web.err
 
 [program:nginx]
 command=/usr/sbin/nginx -g 'daemon off;'
 autostart=true
 autorestart=true
-priority=5
+priority=4
+stdout_logfile=/var/log/supervisor/nginx.log
+stderr_logfile=/var/log/supervisor/nginx.err
 EOF
 
-# Nginx configuration to route traffic
+# Nginx config for port 7860
 RUN cat > /etc/nginx/sites-available/default << 'EOF'
 server {
     listen 7860;
-    server_name localhost;
+    server_name _;
+    
+    client_max_body_size 100M;
 
     location / {
-        proxy_pass http://localhost:3000;
+        proxy_pass http://127.0.0.1:3000;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
         proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_cache_bypass $http_upgrade;
     }
 
-    location /api {
-        proxy_pass http://localhost:8080;
+    location /api/ {
+        proxy_pass http://127.0.0.1:8080/;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
         proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_cache_bypass $http_upgrade;
     }
 }
 EOF
 
-# Initialize script
+# Remove default nginx site if exists
+RUN rm -f /etc/nginx/sites-enabled/default && \
+    ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+
+# Init script
 RUN cat > /init.sh << 'EOF'
 #!/bin/bash
 set -e
 
-# 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
+# Ensure data directory exists
+mkdir -p /app/data
+chmod 777 /app/data
 
-# 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"
+# Initialize SQLite database if not exists
+if [ ! -f /app/data/agenta.db ]; then
+    echo "Initializing SQLite database..."
+    touch /app/data/agenta.db
+    chmod 666 /app/data/agenta.db
+fi
 
-# 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
+# Export environment variables for supervisor
+export DATABASE_URL=${DATABASE_URL}
+export REDIS_URL=${REDIS_URL}
 
-# Run database migrations
-sleep 5
+echo "Starting Agenta services..."
+echo "Database: $DATABASE_URL"
+echo "Redis: $REDIS_URL"
 
-# Start all services via supervisor
+# Start supervisor
 exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
 EOF