Update Dockerfile

Dockerfile

@@ -1,150 +1,32 @@
 # Use official LibreChat base image
 FROM ghcr.io/danny-avila/librechat-dev:latest
 
-# Install system dependencies
+# Install Python dependencies
 USER root
 RUN apk update && apk add --no-cache \
-    nginx \
     python3 \
     py3-pip \
     sqlite \
-    && pip3 install flask werkzeug  --break-system-packages \
-    && mkdir -p /var/lib/nginx/tmp \
-    && chown -R nginx:nginx /var/lib/nginx \
-    && chmod -R 770 /var/lib/nginx \
-    && mkdir -p /app/admin/{templates,static} \
-    && mkdir -p /app/data \
+    && pip3 install flask werkzeug waitress requests --break-package-system
+
+# Setup directory structure
+RUN mkdir -p /app/{admin/{templates,static},data,uploads,client/public/images,api/logs} \
     && chown -R 1000:1000 /app \
-    && mkdir -p /app/uploads/temp \
-    && chmod -R 777 /app/uploads/temp \
+    && chmod -R 777 /app/uploads \
     && chmod -R 777 /app/client/public/images \
-    && chmod -R 777 /app/api/logs \
-    && mkdir -p /app/{nginx/{logs,tmp,client_body},admin/{templates,static},data,uploads,client/public/images,api/logs} \
-    && mkdir -p /app/nginx/client_body \
-    && chmod -R 777 /app/nginx/client_body
-# 2. Recompile NGINX with custom paths (critical fix)
-RUN apk add --no-cache --virtual .build-deps \
-    build-base \
-    linux-headers \
-    openssl-dev \
-    pcre-dev \
-    zlib-dev \
-    && wget http://nginx.org/download/nginx-1.24.0.tar.gz \
-    && tar xzf nginx-1.24.0.tar.gz \
-    && cd nginx-1.24.0 \
-    && ./configure \
-        --prefix=/app/nginx \
-        --sbin-path=/usr/sbin/nginx \
-        --conf-path=/app/nginx/nginx.conf \
-        --error-log-path=/app/nginx/logs/error.log \
-        --pid-path=/app/nginx/nginx.pid \
-        --lock-path=/app/nginx/nginx.lock \
-        --http-log-path=/app/nginx/logs/access.log \
-        --http-client-body-temp-path=/app/nginx/client_body \
-        --http-proxy-temp-path=/app/nginx/tmp \
-        --http-fastcgi-temp-path=/app/nginx/tmp \
-        --user=nginx \
-        --group=nginx \
-    && make \
-    && make install \
-    && apk del .build-deps \
-    && rm -rf /nginx-1.24.0*
-# ===== Admin Panel =====
-COPY <<"EOF" /app/admin/app.py
-from flask import Flask, request, jsonify, render_template
-import os
-import sqlite3
-from werkzeug.security import generate_password_hash
-from pathlib import Path
-
-app = Flask(__name__, 
-           template_folder=str(Path(__file__).parent/'templates'),
-           static_folder=str(Path(__file__).parent/'static'))
-
-# Validate secrets
-required_secrets = ['FLASK_SECRET', 'SUDO_SECRET']
-for secret in required_secrets:
-    if not os.getenv(secret):
-        raise RuntimeError(f"Missing required secret: {secret}")
-
-app.secret_key = os.getenv("FLASK_SECRET")
-
-# SQLite database
-DB_PATH = '/app/data/admin.db'
-
-def get_db():
-    Path(DB_PATH).parent.mkdir(exist_ok=True)
-    db = sqlite3.connect(DB_PATH)
-    db.execute('''CREATE TABLE IF NOT EXISTS users
-                 (username TEXT PRIMARY KEY, password TEXT, role TEXT)''')
-    return db
-
-@app.route('/sudo')
-def home():
-    return render_template('login.html')
-
-@app.route('/sudo/login', methods=['POST'])
-def login():
-    if request.json.get('sudo_secret') == os.getenv("SUDO_SECRET"):
-        return jsonify({"status": "success"})
-    return jsonify({"error": "Invalid secret"}), 403
-
-@app.route('/sudo/dashboard')
-def dashboard():
-    return render_template('dashboard.html')
-
-@app.route('/sudo/add_user', methods=['POST'])
-def add_user():
-    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
-        return jsonify({"error": "Unauthorized"}), 403
-    
-    db = get_db()
-    try:
-        db.execute("INSERT INTO users VALUES (?,?,?)", [
-            request.json["username"],
-            generate_password_hash(request.json["password"]),
-            "user"
-        ])
-        db.commit()
-        return jsonify({"status": "User added"})
-    except sqlite3.IntegrityError:
-        return jsonify({"error": "User exists"}), 400
-
-@app.route('/sudo/list_users', methods=['GET'])
-def list_users():
-    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
-        return jsonify({"error": "Unauthorized"}), 403
-    
-    db = get_db()
-    return jsonify([
-        {"username": row[0]} for row in db.execute("SELECT username FROM users")
-    ])
-
-@app.route('/sudo/remove_user', methods=['POST'])
-def remove_user():
-    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
-        return jsonify({"error": "Unauthorized"}), 403
-    
-    db = get_db()
-    db.execute("DELETE FROM users WHERE username=?", [request.json["username"]])
-    db.commit()
-    return jsonify({"status": "User removed"})
-
-if __name__ == "__main__":
-    app.run(host="0.0.0.0", port=5000)
-EOF
+    && chmod -R 777 /app/api/logs
 
-# Admin templates
+# ===== Admin Templates =====
 COPY <<"EOF" /app/admin/templates/login.html
 <!DOCTYPE html>
 <html>
 <head>
-    <title>LibreChat Admin</title>
+    <title>Admin Login</title>
     <link rel="stylesheet" href="/static/admin.css">
 </head>
 <body>
     <div class="container">
-        <h2>LibreChat Admin</h2>
+        <h2>Admin Portal</h2>
         <form id="loginForm">
             <input type="password" name="sudo_secret" placeholder="Admin Secret" required>
             <button type="submit">Login</button>
@@ -183,7 +65,7 @@ COPY <<"EOF" /app/admin/templates/dashboard.html
 </html>
 EOF
 
-# Static files
+# ===== Admin Static Files =====
 COPY <<"EOF" /app/admin/static/admin.css
 body {
     font-family: Arial, sans-serif;
@@ -273,81 +155,123 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 EOF
 
-COPY <<"EOF" /app/nginx/nginx.conf
-worker_processes auto;
-
-error_log /app/nginx/logs/error.log warn;
-pid /tmp/nginx.pid;
+# ===== Combined Server =====
+COPY <<"EOF" /app/combined_server.py
+from flask import Flask, request, jsonify, render_template, make_response
+from werkzeug.middleware.proxy_fix import ProxyFix
+from werkzeug.security import generate_password_hash
+import os
+import sqlite3
+from pathlib import Path
+import subprocess
+import requests
+from waitress import serve
 
-events {
-    worker_connections 1024;
-}
+app = Flask(__name__, 
+           template_folder='/app/admin/templates',
+           static_folder='/app/admin/static')
+app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_prefix=1)
+app.secret_key = os.getenv("FLASK_SECRET")
 
-http {
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    sendfile on;
-    keepalive_timeout 65;
-    client_max_body_size 20M;
-    
-    client_body_temp_path /app/nginx/client_body;
-    proxy_temp_path /app/nginx/tmp;
-    fastcgi_temp_path /app/nginx/tmp;
-    uwsgi_temp_path /app/nginx/tmp;
-    scgi_temp_path /app/nginx/tmp;
+# Database setup
+DB_PATH = '/app/data/admin.db'
 
-    server {
-        listen 7860;
-        server_name localhost;
-        root /app;
+def get_db():
+    Path(DB_PATH).parent.mkdir(exist_ok=True)
+    db = sqlite3.connect(DB_PATH)
+    db.execute('''CREATE TABLE IF NOT EXISTS users
+                 (username TEXT PRIMARY KEY, password TEXT, role TEXT)''')
+    return db
 
-        # LibreChat API
-        location / {
-            proxy_pass http://localhost:3080;
-            proxy_set_header Host \$host;
-            proxy_set_header X-Real-IP \$remote_addr;
-            proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
-        }
+# Admin routes
+@app.route('/sudo')
+def admin_home():
+    return render_template('login.html')
 
-        # Admin Panel
-        location /sudo {
-            proxy_pass http://localhost:5000;
-            proxy_set_header X-Sudo-Secret \$http_x_sudo_secret;
-        }
+@app.route('/sudo/login', methods=['POST'])
+def login():
+    if request.json.get('sudo_secret') == os.getenv("SUDO_SECRET"):
+        return jsonify({"status": "success"})
+    return jsonify({"error": "Invalid secret"}), 403
 
-        # Static files
-        location /static {
-            alias /app/admin/static;
-            expires 30d;
-            access_log off;
-        }
+@app.route('/sudo/dashboard')
+def dashboard():
+    return render_template('dashboard.html')
 
-        access_log /app/nginx/logs/access.log;
+@app.route('/sudo/add_user', methods=['POST'])
+def add_user():
+    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
+        return jsonify({"error": "Unauthorized"}), 403
+    
+    db = get_db()
+    try:
+        db.execute("INSERT INTO users VALUES (?,?,?)", [
+            request.json["username"],
+            generate_password_hash(request.json["password"]),
+            "user"
+        ])
+        db.commit()
+        return jsonify({"status": "User added"})
+    except sqlite3.IntegrityError:
+        return jsonify({"error": "User exists"}), 400
 
-    }
-}
-EOF
-RUN chmod 777 /app/nginx/nginx.conf
-# Startup script
-COPY <<"EOF" /start.sh
-#!/bin/sh
-# Fix permissions
-#chown -R nginx:nginx /var/lib/nginx
-#chmod -R 770 /var/lib/nginx
+@app.route('/sudo/list_users', methods=['GET'])
+def list_users():
+    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
+        return jsonify({"error": "Unauthorized"}), 403
+    
+    db = get_db()
+    return jsonify([
+        {"username": row[0]} for row in db.execute("SELECT username FROM users")
+    ])
 
-# Start LibreChat (using the correct command)
-cd /app && npm run backend &
+@app.route('/sudo/remove_user', methods=['POST'])
+def remove_user():
+    if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
+        return jsonify({"error": "Unauthorized"}), 403
+    
+    db = get_db()
+    db.execute("DELETE FROM users WHERE username=?", [request.json["username"]])
+    db.commit()
+    return jsonify({"status": "User removed"})
 
-# Start Admin Panel
-cd /app/admin && python3 app.py &
+# LibreChat proxy
+@app.route('/', defaults={'path': ''})
+@app.route('/<path:path>', methods=['GET', 'POST', 'PUT', 'DELETE'])
+def proxy(path):
+    if path.startswith('sudo/') or path == 'sudo':
+        return make_response("Not Found", 404)
+    
+    resp = requests.request(
+        method=request.method,
+        url=f"http://localhost:3080/{path}",
+        headers={key: value for (key, value) in request.headers if key != 'Host'},
+        data=request.get_data(),
+        cookies=request.cookies,
+        allow_redirects=False
+    )
+    
+    response = make_response(resp.content, resp.status_code)
+    for key, value in resp.headers.items():
+        if key.lower() not in ['content-encoding', 'content-length', 'transfer-encoding']:
+            response.headers[key] = value
+    return response
 
-# Start NGINX
-nginx -c /app/nginx/nginx.conf -g "daemon off;"
+if __name__ == "__main__":
+    # Start LibreChat backend
+    subprocess.Popen(["npm", "run", "start:backend"], cwd="/app")
+    
+    # Start combined server
+    serve(app, host='0.0.0.0', port=7860, threads=4)
+EOF
 
-# Keep container running
-wait
+# Startup script
+COPY <<"EOF" /app/start.sh
+#!/bin/sh
+# Start the combined server
+python3 /app/combined_server.py
 EOF
-RUN chmod +x /start.sh
+RUN chmod +x /app/start.sh
 
 # Environment variables
 ENV HOST=0.0.0.0 \
@@ -365,4 +289,4 @@ ENV HOST=0.0.0.0 \
     NODE_ENV=production
 
 EXPOSE 7860
-CMD ["/start.sh"]
+CMD ["/app/start.sh"]