Update Dockerfile

Dockerfile

@@ -37,66 +37,49 @@ RUN apt-get update && apt-get install -y \
     && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen \
     && locale-gen
 
-# Set up PostgreSQL directories with standard locations
-RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
-    chown -R user:user /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
-    chmod 700 /var/lib/postgresql/data
-
-# Create application directories
-RUN mkdir -p /app/api /app/web /data/storage && \
-    chown -R user:user /app /data && \
-    chmod 777 /data /app
-
 # Configure nginx
-COPY <<EOF /etc/nginx/nginx.conf
-user user;
-worker_processes auto;
-error_log /var/log/nginx/error.log;
-pid /run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
+RUN rm /etc/nginx/sites-enabled/default || true
+COPY <<EOF /etc/nginx/sites-available/dify
+server {
+    listen 7860;
+    server_name _;
+
+    location / {
+        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_cache_bypass \$http_upgrade;
+    }
 
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    access_log /var/log/nginx/access.log combined;
-    sendfile on;
-    keepalive_timeout 65;
-
-    server {
-        listen 7860;
-        server_name _;
-        
-        location / {
-            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_cache_bypass \$http_upgrade;
-        }
-
-        location /api {
-            proxy_pass http://127.0.0.1:5001;
-            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://127.0.0.1:5001;
+        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
 
-RUN mkdir -p /var/log/nginx && \
+RUN ln -s /etc/nginx/sites-available/dify /etc/nginx/sites-enabled/ && \
+    mkdir -p /var/log/nginx && \
     chown -R user:user /var/log/nginx && \
-    chown -R user:user /var/lib/nginx && \
-    chown -R user:user /etc/nginx && \
     touch /run/nginx.pid && \
     chown -R user:user /run/nginx.pid
 
+# Set up PostgreSQL directories with standard locations
+RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
+    chown -R user:user /var/run/postgresql /var/lib/postgresql/data /var/log/postgresql && \
+    chmod 700 /var/lib/postgresql/data
+
+# Create application directories
+RUN mkdir -p /app/api /app/web /data/storage && \
+    chown -R user:user /app /data && \
+    chmod 777 /data /app
+
 # Switch to user for remaining operations
 USER user
 
@@ -220,12 +203,15 @@ cd /app/api && poetry run python -m gunicorn app:app \\\n\
 # Start frontend server\n\
 cd /app/web && PORT=3000 node server.js &\n\
 \n\
-# Start nginx\n\
-nginx -g "daemon off;" &\n\
+# Start nginx as root (required for port 7860)\n\
+sudo nginx -g "daemon off;" &\n\
 \n\
 wait' > /app/entrypoint.sh && \
 chmod +x /app/entrypoint.sh
 
+# Add sudo capabilities for nginx
+RUN echo "user ALL=(ALL) NOPASSWD: /usr/sbin/nginx" >> /etc/sudoers
+
 WORKDIR /app
 
 CMD ["./entrypoint.sh"]