Zeilenenden vereinheitlicht (LF)

backend/app.py

@@ -17,6 +17,9 @@ from datetime import timedelta
 from PyP100 import PyP100
 from dotenv import load_dotenv
 
+# Importiere Netzwerkkonfiguration
+from network_config import NetworkConfig
+
 # Lade Umgebungsvariablen
 load_dotenv()
 
@@ -24,6 +27,9 @@ load_dotenv()
 app = Flask(__name__)
 CORS(app, supports_credentials=True)
 
+# Initialisiere Netzwerkkonfiguration
+network_config = NetworkConfig(app)
+
 # Konfiguration
 app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY', 'dev_secret_key')
 app.config['DATABASE'] = os.environ.get('DATABASE_PATH', 'instance/myp.db')

backend/debug-server/requirements.txt

@@ -1,3 +1,15 @@
-Flask==2.0.1
-psutil==5.9.0
-netifaces==0.11.0 
+flask==2.2.3
+flask-cors==3.0.10
+psutil==5.9.4
+matplotlib==3.7.1
+pandas==1.5.3
+requests==2.28.2
+netifaces==0.11.0
+Werkzeug==2.2.3
+docker==6.1.2
+pillow==9.4.0
+send_file==0.2.0
+python-dotenv>=1.0.0
+python-logging-loki>=0.3.1
+colorama>=0.4.6
+pygal>=3.0.0 

backend/docker-compose.yml

@@ -4,7 +4,9 @@ services:
   backend:
     build: .
     container_name: myp-backend
-    network_mode: host
+    networks:
+      backend_network:
+        ipv4_address: 192.168.0.5
     environment:
       - SECRET_KEY=${SECRET_KEY:-7445630171969DFAC92C53CEC92E67A9CB2E00B3CB2F}
       - DATABASE_PATH=${DATABASE_PATH:-instance/myp.db}
@@ -13,13 +15,25 @@ services:
       - "PRINTERS=${PRINTERS:-{\"Printer 1\": {\"ip\": \"192.168.0.100\"}, \"Printer 2\": {\"ip\": \"192.168.0.101\"}, \"Printer 3\": {\"ip\": \"192.168.0.102\"}, \"Printer 4\": {\"ip\": \"192.168.0.103\"}, \"Printer 5\": {\"ip\": \"192.168.0.104\"}, \"Printer 6\": {\"ip\": \"192.168.0.106\"}}}"
       - FLASK_APP=app.py
       - PYTHONUNBUFFERED=1
+      - HOST=0.0.0.0
+      - PORT=5000
+    ports:
+      - "5000:5000"
     volumes:
       - ./logs:/app/logs
       - ./instance:/app/instance
-    restart: unless-stopped
+    restart: always
     healthcheck:
       test: ["CMD", "wget", "--spider", "http://localhost:5000/health"]
       interval: 30s
       timeout: 10s
       retries: 3
-      start_period: 40s
+      start_period: 40s
+
+networks:
+  backend_network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 192.168.0.0/24
+          gateway: 192.168.0.1

backend/requirements.txt

@@ -4,4 +4,6 @@ pyjwt==2.8.0
 python-dotenv==1.0.0
 werkzeug==2.3.7
 gunicorn==21.2.0
-PyP100==0.0.19
+PyP100==0.0.19
+netifaces==0.11.0
+requests==2.31.0