librechat

Running

App Files Files

martynka commited on Jul 2

Commit

4b64cf1

verified ·

1 Parent(s): 633350e

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +80 -211

Dockerfile CHANGED Viewed

@@ -7,7 +7,7 @@ RUN apk update && apk add --no-cache \
     python3 \
     py3-pip \
     sqlite \
-    && pip3 install flask werkzeug waitress requests --break-system-packages
 # Setup directory structure
 RUN mkdir -p /app/{admin/{templates,static},data,uploads,client/public/images,api/logs} \
@@ -17,240 +17,109 @@ RUN mkdir -p /app/{admin/{templates,static},data,uploads,client/public/images,ap
     && chmod -R 777 /app/client/public/images \
     && chmod -R 777 /app/api/logs
-# ===== Admin Templates =====
-COPY <<"EOF" /app/admin/templates/login.html
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Admin Login</title>
-    <link rel="stylesheet" href="/static/admin.css">
-</head>
-<body>
-    <div class="container">
-        <h2>Admin Portal</h2>
-        <form id="loginForm">
-            <input type="password" name="sudo_secret" placeholder="Admin Secret" required>
-            <button type="submit">Login</button>
-        </form>
-    </div>
-    <script src="/static/admin.js"></script>
-</body>
-</html>
-EOF
-COPY <<"EOF" /app/admin/templates/dashboard.html
-<!DOCTYPE html>
-<html>
-<head>
-    <title>User Management</title>
-    <link rel="stylesheet" href="/static/admin.css">
-</head>
-<body>
-    <div class="container">
-        <h1>User Management</h1>
-        <div class="card">
-            <h2>Add User</h2>
-            <form id="addUserForm">
-                <input type="text" name="username" placeholder="Username" required>
-                <input type="password" name="password" placeholder="Password" required>
-                <button type="submit">Add User</button>
-            </form>
-        </div>
-        <div class="card">
-            <h2>Current Users</h2>
-            <ul id="userList"></ul>
-        </div>
-    </div>
-    <script src="/static/admin.js"></script>
-</body>
-</html>
-EOF
-# ===== Admin Static Files =====
-COPY <<"EOF" /app/admin/static/admin.css
-body {
-    font-family: Arial, sans-serif;
-    margin: 0;
-    padding: 20px;
-    background-color: #f5f5f5;
-}
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-.card {
-    background: white;
-    padding: 20px;
-    margin: 20px 0;
-    border-radius: 8px;
-    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-}
-input, button {
-    width: 100%;
-    padding: 10px;
-    margin: 8px 0;
-    box-sizing: border-box;
-}
-button {
-    background-color: #4CAF50;
-    color: white;
-    border: none;
-    cursor: pointer;
-}
-EOF
-COPY <<"EOF" /app/admin/static/admin.js
-async function loadUsers() {
-    const response = await fetch('/sudo/list_users', {
-        headers: {'X-Sudo-Secret': localStorage.getItem('sudo_token')}
-    });
-    if (response.ok) {
-        const users = await response.json();
-        document.getElementById('userList').innerHTML = users.map(user =>
-            \`<li>\${user.username} <button onclick="deleteUser('\${user.username}')">Delete</button></li>\`
-        ).join('');
-    }
-}
-async function deleteUser(username) {
-    if (confirm(\`Delete \${username}?\`)) {
-        await fetch('/sudo/remove_user', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'X-Sudo-Secret': localStorage.getItem('sudo_token')
-            },
-            body: JSON.stringify({ username: username })
-        });
-        loadUsers();
-    }
-}
-document.getElementById('addUserForm').addEventListener('submit', async (e) => {
-    e.preventDefault();
-    const formData = new FormData(e.target);
-    const response = await fetch('/sudo/add_user', {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            'X-Sudo-Secret': localStorage.getItem('sudo_token')
-        },
-        body: JSON.stringify({
-            username: formData.get('username'),
-            password: formData.get('password')
-        })
-    });
-    if (response.ok) {
-        e.target.reset();
-        await loadUsers();
-    }
-});
-document.addEventListener('DOMContentLoaded', () => {
-    const token = localStorage.getItem('sudo_token');
-    if (!token && !window.location.pathname.includes('login')) {
-        window.location.href = '/sudo';
-    } else if (token) {
-        loadUsers();
-    }
-});
-EOF
-# 3. Create the Python server
-COPY <<"EOF" /app/server.py
 from flask import Flask, request, jsonify, render_template
-from waitress import serve
-import sqlite3
-import subprocess
-import threading
-import os
 from werkzeug.security import generate_password_hash
 app = Flask(__name__, template_folder='/app/admin/templates')
-app.secret_key = os.getenv("FLASK_SECRET", "secret-key-123")
-# Database setup
-def get_db():
-    conn = sqlite3.connect('/app/data/users.db')
-    conn.execute('''
-        CREATE TABLE IF NOT EXISTS users (
-            username TEXT PRIMARY KEY,
-            password TEXT,
-            role TEXT DEFAULT 'user'
-        )
-    ''')
-    return conn
-# Admin routes
-@app.route('/sudo')
-def admin_login():
     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",
-            "token": os.getenv("SUDO_SECRET")
-        })
-    return jsonify({"error": "Invalid password"}), 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 (username, password) VALUES (?, ?)",
-            [request.json["username"], generate_password_hash(request.json["password"])]
-        )
-        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()
-    users = db.execute("SELECT username FROM users").fetchall()
-    return jsonify([{"username": u[0]} for u in 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 deleted"})
-# Start LibreChat in background
-def start_librechat():
-    subprocess.run(["npm", "run", "backend"], cwd="/app")
-threading.Thread(target=start_librechat, daemon=True).start()
-# Start server
 if __name__ == "__main__":
-    print("Admin panel: http://localhost:7860/sudo")
-    serve(app, host="0.0.0.0", port=7860)
 EOF
 # Startup script
 COPY <<"EOF" /app/start.sh
 #!/bin/sh
 # Start the combined server
-python3 /app/server.py
 EOF
 RUN chmod +x /app/start.sh

     python3 \
     py3-pip \
     sqlite \
+    && pip3 install flask werkzeug waitress requests pymongo waitress --break-system-packages
 # Setup directory structure
 RUN mkdir -p /app/{admin/{templates,static},data,uploads,client/public/images,api/logs} \
     && chmod -R 777 /app/client/public/images \
     && chmod -R 777 /app/api/logs
+# ===== ADMIN PANEL (Adapted from LibreChat community) =====
+COPY <<"EOF" /app/admin/app.py
 from flask import Flask, request, jsonify, render_template
+from pymongo import MongoClient
 from werkzeug.security import generate_password_hash
+import os
+from waitress import serve
 app = Flask(__name__, template_folder='/app/admin/templates')
+app.secret_key = os.getenv("FLASK_SECRET")
+# Connect to LibreChat's MongoDB
+client = MongoClient(os.getenv("MONGO_URI", "mongodb://localhost:27017"))
+db = client.get_default_database()
+@app.route('/admin')
+def admin_home():
     return render_template('login.html')
+@app.route('/admin/login', methods=['POST'])
 def login():
+    if request.json.get('admin_secret') == os.getenv("SUDO_SECRET"):
+        return jsonify({"status": "success", "token": os.getenv("SUDO_SECRET")})
+    return jsonify({"error": "Invalid secret"}), 403
+@app.route('/admin/users', methods=['GET'])
+def list_users():
+    if request.headers.get('X-Admin-Token') != os.getenv("SUDO_SECRET"):
         return jsonify({"error": "Unauthorized"}), 403
+    users = list(db.users.find({}, {"_id": 0, "username": 1, "email": 1}))
+    return jsonify(users)
+@app.route('/admin/users', methods=['POST'])
+def add_user():
+    if request.headers.get('X-Admin-Token') != os.getenv("SUDO_SECRET"):
         return jsonify({"error": "Unauthorized"}), 403
+    user_data = {
+        "username": request.json["username"],
+        "password": generate_password_hash(request.json["password"]),
+        "email": request.json.get("email", ""),
+        "role": "user"
+    }
+    db.users.insert_one(user_data)
+    return jsonify({"status": "User added"})
+@app.route('/admin/users', methods=['DELETE'])
+def delete_user():
+    if request.headers.get('X-Admin-Token') != os.getenv("SUDO_SECRET"):
         return jsonify({"error": "Unauthorized"}), 403
+    db.users.delete_one({"username": request.json["username"]})
     return jsonify({"status": "User deleted"})
 if __name__ == "__main__":
+    serve(app, host='0.0.0.0', port=5000)
+EOF
+# ===== ADMIN TEMPLATES =====
+COPY <<"EOF" /app/admin/templates/login.html
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Admin Login</title>
+    <style>
+        body { font-family: Arial; padding: 20px; }
+        form { max-width: 400px; margin: 0 auto; }
+        input, button { width: 100%; padding: 8px; margin: 5px 0; }
+    </style>
+</head>
+<body>
+    <form id="loginForm">
+        <h2>Admin Login</h2>
+        <input type="password" placeholder="Admin Secret" required>
+        <button type="submit">Login</button>
+    </form>
+    <script>
+        document.getElementById('loginForm').onsubmit = async (e) => {
+            e.preventDefault();
+            const response = await fetch('/admin/login', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ admin_secret: e.target[0].value })
+            });
+            if (response.ok) {
+                localStorage.setItem('admin_token', await response.text());
+                window.location.href = '/admin/dashboard';
+            } else {
+                alert('Invalid secret!');
+            }
+        };
+    </script>
+</body>
+</html>
 EOF
 # Startup script
 COPY <<"EOF" /app/start.sh
 #!/bin/sh
 # Start the combined server
+cd /app && npm run start:backend &
+python3 /app/admin/app.py &
+wait
 EOF
 RUN chmod +x /app/start.sh