Hotfix applied

.gitignore

@@ -37,9 +37,10 @@ htmlcov/
 *.bak
 *.swp
 
-
 # Docker
 .docker
 
 # Mqtt
-mqtt/passwordfile
+mqtt/config/
+mqtt/data/
+mqtt/log/

Dockerfile

@@ -1,26 +1,17 @@
-FROM python:3.12-slim-bookworm
+    FROM python:3.12-slim-bookworm
 
-WORKDIR /code
+    WORKDIR /code
 
-COPY ./requirements.txt /code/requirements.txt
+    COPY ./requirements.txt /code/requirements.txt
 
-COPY ./version.txt /code/version.txt
+    RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
-COPY ./public/uploads/default.jpg /code/public/uploads/default.jpg
+    COPY ./version.txt /code/version.txt
 
-ARG MQTT_USER
-ARG MQTT_PASSWORD
+    COPY ./public/uploads/default.jpg /code/public/uploads/default.jpg
 
-ENV MQTT_USER=${MQTT_USER} \
-    MQTT_PASSWORD=${MQTT_PASSWORD}
+    COPY ./mqtt /code/mqtt
 
-COPY ./mqtt/entrypoint.sh /code/mqtt/entrypoint.sh
-COPY ./mqtt/mosquitto.conf /code/mqtt/mosquitto.conf
+    COPY ./app /code/app
 
-RUN echo "${MQTT_USER}:${MQTT_PASSWORD}" > /code/mqtt/passwordfile
-
-RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
-
-COPY ./app /code/app
-
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "5000", "--workers", "4"]
+    CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "5000", "--workers", "4"]

docker-compose.prd.yml

@@ -30,6 +30,9 @@ services:
       DATABASE_URL: ${DATABASE_URL}
       DATABASE_URL_TEST: ${DATABASE_URL_TEST}
       SECRET_KEY: ${SECRET_KEY}
+      MQTT_HOST: ${MQTT_HOST}
+      MQTT_USER: ${MQTT_USER}
+      MQTT_PASSWORD: ${MQTT_PASSWORD}
     volumes:
       - uploads_data:/app/public/uploads
       - ./logs:/app/logs
@@ -46,12 +49,14 @@ services:
       - frontend
       - backend
 
-  mqtt:
+  mqtt-prod:
     image: eclipse-mosquitto
-    container_name: mqtt
+    container_name: mqtt-prod
     restart: unless-stopped
-    env_file:
-      - .env
+    environment:
+      MQTT_HOST: ${MQTT_HOST}
+      MQTT_USER: ${MQTT_USER}
+      MQTT_PASSWORD: ${MQTT_PASSWORD}
     volumes:
       - ./mqtt/mosquitto.conf:/mosquitto/config/mosquitto.conf
       - ./mqtt/entrypoint.sh:/mosquitto/entrypoint.sh
@@ -62,6 +67,8 @@ services:
       - "1883:1883"
       - "9001:9001"
     entrypoint: [ "/mosquitto/entrypoint.sh" ]
+    networks:
+      - frontend
 
 volumes:
   postgres_data:

docker-compose.yml

@@ -18,9 +18,9 @@ services:
       retries: 5
       start_period: 10s
 
-  mqtt:
+  mqtt-dev:
     image: eclipse-mosquitto
-    container_name: mqtt
+    container_name: mqtt-dev
     restart: unless-stopped
     env_file:
       - .env

mqtt/entrypoint.sh

@@ -23,7 +23,7 @@ else
   fi
 fi
 
-chmod 0640 "$PASSFILE"
+chmod 640 "$PASSFILE"
 chown mosquitto:mosquitto "$PASSFILE"
 
 exec mosquitto -c /mosquitto/config/mosquitto.conf

version.txt

@@ -1 +1 @@
-2.3.2
+2.3.3