From ede171eb0c3a01f54c0222cc4249b69c413ba288 Mon Sep 17 00:00:00 2001
From: Emre Gezer <21geem1bif@hft-stuttgart.de>
Date: Sat, 19 Apr 2025 23:05:42 +0200
Subject: [PATCH] we still need to modify the docker files so that we can start
the project from their
---
docker-compose.yml | 14 +++++++++++++-
mqtt/Dockerfile | 7 ++-----
mqtt/mqtt_stuff_goes_here.txt | 0
mqtt/src/mqtt_influx_backend/mac_to_room.json | 3 ++-
4 files changed, 17 insertions(+), 7 deletions(-)
delete mode 100644 mqtt/mqtt_stuff_goes_here.txt
diff --git a/docker-compose.yml b/docker-compose.yml
index f7b96d0..a990abe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,18 @@
-version: '3.9'
services:
+
+ mqtt-backend:
+ image: mqtt-influx-backend
+ container_name: mqtt-backend
+ build: ./mqtt
+ command: uv run -m mqtt_influx_backend.main
+ env_file:
+ - mqtt/.env
+ restart: unless-stopped
+ #depends_on:
+ # - influxdb
+ # - mosquitto
+
backend:
build: ./backend
ports:
diff --git a/mqtt/Dockerfile b/mqtt/Dockerfile
index c566cfe..b2c96ab 100644
--- a/mqtt/Dockerfile
+++ b/mqtt/Dockerfile
@@ -9,11 +9,8 @@ COPY . .
# uv installieren
RUN pip install uv
-# Abhängigkeiten aus pyproject.toml installieren
-RUN uv pip install --editable . --no-cache-dir
-
-# PYTHONPATH setzen, damit das Import-Modul korrekt ist
-ENV PYTHONPATH=src
+# Installiere Abhängigkeiten aus pyproject.toml
+RUN uv pip install . --no-cache-dir --system
# Startkommando
CMD ["uv", "run", "-m", "mqtt_influx_backend.main"]
diff --git a/mqtt/mqtt_stuff_goes_here.txt b/mqtt/mqtt_stuff_goes_here.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/mqtt/src/mqtt_influx_backend/mac_to_room.json b/mqtt/src/mqtt_influx_backend/mac_to_room.json
index b1bfeb2..94dcdcf 100644
--- a/mqtt/src/mqtt_influx_backend/mac_to_room.json
+++ b/mqtt/src/mqtt_influx_backend/mac_to_room.json
@@ -4,5 +4,6 @@
"77:88:99:AA:BB:CC": "Schlafzimmer",
"DE:AD:BE:EF:12:34": "",
"DK:AD:BE:EF:12:34": "",
- "EK:AD:BE:EF:12:34": ""
+ "EK:AD:BE:EF:12:34": "",
+ "lK:AD:BE:EF:12:34": ""
}
\ No newline at end of file
--
GitLab