librechat

Running

App Files Files

martynka commited on Jul 1

Commit

b08ee08

verified ·

1 Parent(s): 5bf8328

Update Dockerfile

Browse files

Files changed (1) hide show

Dockerfile +51 -29

Dockerfile CHANGED Viewed

@@ -12,12 +12,13 @@ RUN apk update && apk add --no-cache \
 # Setup directories within /app
 RUN mkdir -p /app/admin/{templates,static} \
     && chmod -R 777 /app/uploads/temp \
     && chmod -R 777 /app/client/public/images \
     && chmod -R 777 /app/api/logs
 # ===== Integrated Admin Panel =====
-COPY <<EOF /app/admin/app.py
 from flask import Flask, request, jsonify, render_template
 import os
 import sqlite3
@@ -49,6 +50,10 @@ def login():
         return jsonify({"status": "success"})
     return jsonify({"error": "Invalid secret"}), 403
 @app.route('/sudo/add_user', methods=['POST'])
 def add_user():
     if request.headers.get('X-Sudo-Secret') != os.getenv("SUDO_SECRET"):
@@ -78,7 +83,7 @@ def list_users():
 EOF
 # Admin templates
-COPY <<EOF /app/admin/templates/login.html
 <!DOCTYPE html>
 <html>
 <head>
@@ -93,26 +98,12 @@ COPY <<EOF /app/admin/templates/login.html
             <button type="submit">Login</button>
         </form>
     </div>
-    <script>
-        document.getElementById('loginForm').addEventListener('submit', async (e) => {
-            e.preventDefault();
-            const response = await fetch('/sudo/login', {
-                method: 'POST',
-                headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({sudo_secret: e.target.sudo_secret.value})
-            });
-            if (response.ok) {
-                window.location.href = '/sudo/dashboard';
-            } else {
-                alert('Invalid secret!');
-            }
-        });
-    </script>
 </body>
 </html>
 EOF
-COPY <<EOF /app/admin/templates/dashboard.html
 <!DOCTYPE html>
 <html>
 <head>
@@ -141,7 +132,7 @@ COPY <<EOF /app/admin/templates/dashboard.html
 EOF
 # Static files
-COPY <<EOF /app/admin/static/admin.css
 body {
     font-family: Arial, sans-serif;
     margin: 0;
@@ -173,19 +164,34 @@ button {
 }
 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}</li>`
         ).join('');
     }
 }
 document.getElementById('addUserForm').addEventListener('submit', async (e) => {
     e.preventDefault();
     const formData = new FormData(e.target);
@@ -206,17 +212,26 @@ document.getElementById('addUserForm').addEventListener('submit', async (e) => {
     }
 });
-// Initialize
 document.addEventListener('DOMContentLoaded', () => {
-    if (!localStorage.getItem('sudo_token') && !window.location.pathname.includes('/login')) {
         window.location.href = '/sudo';
     }
     loadUsers();
 });
 EOF
 # NGINX Configuration
-COPY <<EOF /etc/nginx/nginx.conf
 events { worker_connections 1024; }
 http {
     server {
@@ -244,7 +259,7 @@ http {
 EOF
 # Startup script
-COPY <<EOF /start.sh
 #!/bin/sh
 # Start LibreChat
 cd /app/api && npm run backend &
@@ -263,9 +278,16 @@ RUN chmod +x /start.sh
 # Environment variables
 ENV HOST=0.0.0.0 \
     PORT=3080 \
-    MONGO_URI="mongodb://localhost:27017/librechat" \
-    SUDO_SECRET="your-admin-secret" \
-    FLASK_SECRET="your-flask-secret" \
     NODE_ENV="production"
 EXPOSE 7860

 # Setup directories within /app
 RUN mkdir -p /app/admin/{templates,static} \
+    && mkdir -p /app/data \
     && chmod -R 777 /app/uploads/temp \
     && chmod -R 777 /app/client/public/images \
     && chmod -R 777 /app/api/logs
 # ===== Integrated Admin Panel =====
+COPY <<"EOF" /app/admin/app.py
 from flask import Flask, request, jsonify, render_template
 import os
 import sqlite3
         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"):
 EOF
 # Admin templates
+COPY <<"EOF" /app/admin/templates/login.html
 <!DOCTYPE html>
 <html>
 <head>
             <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>
 EOF
 # Static files
+COPY <<"EOF" /app/admin/static/admin.css
 body {
     font-family: Arial, sans-serif;
     margin: 0;
 }
 EOF
+# Properly escaped JavaScript
+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);
     }
 });
 document.addEventListener('DOMContentLoaded', () => {
+    if (!localStorage.getItem('sudo_token') && !window.location.pathname.includes('login')) {
         window.location.href = '/sudo';
     }
     loadUsers();
 });
 EOF
+# Add delete endpoint to app.py
+RUN echo '@app.route("/sudo/remove_user", methods=["POST"])' >> /app/admin/app.py
+RUN echo 'def remove_user():' >> /app/admin/app.py
+RUN echo '    if request.headers.get("X-Sudo-Secret") != os.getenv("SUDO_SECRET"):' >> /app/admin/app.py
+RUN echo '        return jsonify({"error": "Unauthorized"}), 403' >> /app/admin/app.py
+RUN echo '    db = get_db()' >> /app/admin/app.py
+RUN echo '    db.execute("DELETE FROM users WHERE username=?", [request.json["username"]])' >> /app/admin/app.py
+RUN echo '    db.commit()' >> /app/admin/app.py
+RUN echo '    return jsonify({"status": "User removed"})' >> /app/admin/app.py
 # NGINX Configuration
+COPY <<"EOF" /etc/nginx/nginx.conf
 events { worker_connections 1024; }
 http {
     server {
 EOF
 # Startup script
+COPY <<"EOF" /start.sh
 #!/bin/sh
 # Start LibreChat
 cd /app/api && npm run backend &
 # Environment variables
 ENV HOST=0.0.0.0 \
     PORT=3080 \
+    SESSION_EXPIRY=900000 \
+    REFRESH_TOKEN_EXPIRY=604800000 \
+    SEARCH=true \
+    MEILI_NO_ANALYTICS=true \
+    MEILI_HOST=https://martynka-meilisearch.hf.space \
+    CONFIG_PATH=/app/librechat.yaml \
+    CUSTOM_FOOTER=EasierIT \
+    MONGO_URI="$MONGO_URI" \
+    SUDO_SECRET="$SUDO_SECRET" \
+    FLASK_SECRET="$FLASK_SECRET"
     NODE_ENV="production"
 EXPOSE 7860