Update Dockerfile

Dockerfile

@@ -9,15 +9,17 @@ ENV POETRY_VERSION=1.8.4 \
     POETRY_CACHE_DIR=/tmp/poetry_cache \
     PYTHONDONTWRITEBYTECODE=1
 
-# Create users first
-RUN useradd -m -u 1000 user
+# Create users first with specific GID/UID for HF Spaces compatibility
+RUN groupadd -g 1000 user && \
+    useradd -m -u 1000 -g user user && \
+    usermod -aG postgres user
 
-# Install system dependencies and set up directories
+# Install system dependencies and set up directories with correct permissions
 RUN apt-get update && apt-get install -y \
     postgresql \
     && rm -rf /var/lib/apt/lists/* \
-    && mkdir -p /var/run/postgresql /var/lib/postgresql/data \
-    && chown postgres:postgres /var/run/postgresql /var/lib/postgresql/data \
+    && mkdir -p /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql \
+    && chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql \
     && chmod 2777 /var/run/postgresql \
     && chmod 700 /var/lib/postgresql/data
 
@@ -116,15 +118,21 @@ EXPOSE 7860 3000
 RUN echo '#!/bin/bash\n\
 echo "===== Application Startup at $(date "+%Y-%m-%d %H:%M:%S") ====="\n\
 \n\
-# Start PostgreSQL with proper permissions\n\
-mkdir -p /var/log/postgresql\n\
-chown postgres:postgres /var/log/postgresql\n\
-su - postgres -c "/usr/lib/postgresql/15/bin/pg_ctl -D /var/lib/postgresql/data -l /var/log/postgresql/postgresql.log start"\n\
+# Ensure PostgreSQL directories have correct permissions\n\
+mkdir -p /var/log/postgresql /var/run/postgresql\n\
+chown -R postgres:postgres /var/log/postgresql /var/run/postgresql /var/lib/postgresql/data\n\
+chmod 2777 /var/run/postgresql\n\
+chmod 700 /var/lib/postgresql/data\n\
 \n\
+# Start PostgreSQL as postgres user without using su command\n\
+runuser -u postgres -- /usr/lib/postgresql/15/bin/pg_ctl -D /var/lib/postgresql/data \
+    -l /var/log/postgresql/postgresql.log start\n\
+\n\
+# Wait for PostgreSQL to start\n\
 max_tries=30\n\
 count=0\n\
 echo "Checking database connection..."\n\
-until PGPASSWORD="${DB_PASSWORD}" psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USERNAME}" -d postgres -c "SELECT 1" > /dev/null 2>&1; do\n\
+until PGPASSWORD="${DB_PASSWORD}" psql -h localhost -p 5432 -U postgres -c "SELECT 1" > /dev/null 2>&1; do\n\
     echo "Waiting for database connection... (${count}/${max_tries})"\n\
     sleep 2\n\
     count=$((count+1))\n\
@@ -134,8 +142,11 @@ until PGPASSWORD="${DB_PASSWORD}" psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_
     fi\n\
 done\n\
 \n\
-# Create database if it doesnt exist\n\
-PGPASSWORD="${DB_PASSWORD}" psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USERNAME}" -d postgres -c "CREATE DATABASE ${DB_DATABASE};" || true\n\
+# Create database and set up permissions\n\
+PGPASSWORD="${DB_PASSWORD}" psql -h localhost -p 5432 -U postgres <<-EOSQL\n\
+    CREATE DATABASE ${DB_DATABASE} WITH OWNER ${DB_USERNAME};\n\
+    ALTER USER ${DB_USERNAME} WITH PASSWORD '\''${DB_PASSWORD}'\'';\n\
+EOSQL\n\
 \n\
 echo "Database connection successful"\n\
 \n\