From 88f5fab09ce002df265ffec999e8f55d50cc43ce Mon Sep 17 00:00:00 2001
From: bangdk <bangdk@snatbook.com>
Date: Sat, 23 Nov 2024 10:04:08 +0900
Subject: [PATCH] auto commit

---
 fems-mqtt/Dockerfile        | 25 +++++++++++++++--------
 fems-mqtt/log/mosquitto.log | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/fems-mqtt/Dockerfile b/fems-mqtt/Dockerfile
index dc2647d..c063349 100644
--- a/fems-mqtt/Dockerfile
+++ b/fems-mqtt/Dockerfile
@@ -9,13 +9,22 @@ ARG MQTT_PASSWORD
 COPY ./config/mosquitto.conf /mosquitto/config/mosquitto.conf
 COPY ./config/acl /mosquitto/config/
 
-# 권한 설정 및 비밀번호 파일 생성
-RUN touch /mosquitto/config/passwd && \
-    mosquitto_passwd -b /mosquitto/config/passwd ${MQTT_USERNAME:-fems} ${MQTT_PASSWORD:-fems123!} && \
-    chmod -R 755 /mosquitto/config && \
-    chmod -R 777 /mosquitto/log && \
-    chmod 600 /mosquitto/config/passwd
+# Create entrypoint script with proper permissions setting
+RUN echo '#!/bin/sh' > /docker-entrypoint.sh && \
+    echo 'set -e' >> /docker-entrypoint.sh && \
+    echo 'touch /mosquitto/data/passwd' >> /docker-entrypoint.sh && \
+    echo 'mosquitto_passwd -b /mosquitto/data/passwd "${MQTT_USERNAME}" "${MQTT_PASSWORD}"' >> /docker-entrypoint.sh && \
+    echo 'mosquitto_passwd -b /mosquitto/data/passwd "${NODE_RED_USERNAME}" "${NODE_RED_PASSWORD}"' >> /docker-entrypoint.sh && \
+    echo 'chown -R mosquitto:mosquitto /mosquitto' >> /docker-entrypoint.sh && \
+    echo 'chmod 700 /mosquitto/data/passwd' >> /docker-entrypoint.sh && \
+    echo 'chmod 700 /mosquitto/config/acl' >> /docker-entrypoint.sh && \
+    echo 'chmod -R 755 /mosquitto/log' >> /docker-entrypoint.sh && \
+    echo 'exec "$@"' >> /docker-entrypoint.sh && \
+    chmod +x /docker-entrypoint.sh
 
-EXPOSE 1883 8883
+# Initial permissions setup
+RUN chown -R mosquitto:mosquitto /mosquitto
 
-CMD ["/usr/sbin/mosquitto", "-c", "/mosquitto/config/mosquitto.conf"]
\ No newline at end of file
+EXPOSE 1884 8883
+
+USER mosquitto
\ No newline at end of file
diff --git a/fems-mqtt/log/mosquitto.log b/fems-mqtt/log/mosquitto.log
index 828cf52..702849f 100644
--- a/fems-mqtt/log/mosquitto.log
+++ b/fems-mqtt/log/mosquitto.log
@@ -14570,3 +14570,43 @@ To fix this, use `chmod 0700 /mosquitto/config/passwd`.
 1732322012: New connection from ::1:55434 on port 1883.
 1732322012: New client connected from ::1:55434 as auto-18D814F7-9050-05ED-0575-94D2CFA198CD (p2, c1, k60, u'fems').
 1732322012: Client auto-18D814F7-9050-05ED-0575-94D2CFA198CD closed its connection.
+1732323775: mosquitto version 2.0.20 starting
+1732323775: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323775: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323775: Error opening password file "/mosquitto/data/passwd".
+1732323776: mosquitto version 2.0.20 starting
+1732323776: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323776: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323776: Error opening password file "/mosquitto/data/passwd".
+1732323777: mosquitto version 2.0.20 starting
+1732323777: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323777: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323777: Error opening password file "/mosquitto/data/passwd".
+1732323778: mosquitto version 2.0.20 starting
+1732323778: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323778: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323778: Error opening password file "/mosquitto/data/passwd".
+1732323779: mosquitto version 2.0.20 starting
+1732323779: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323779: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323779: Error opening password file "/mosquitto/data/passwd".
+1732323781: mosquitto version 2.0.20 starting
+1732323781: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323781: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323781: Error opening password file "/mosquitto/data/passwd".
+1732323784: mosquitto version 2.0.20 starting
+1732323784: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323784: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323784: Error opening password file "/mosquitto/data/passwd".
+1732323791: mosquitto version 2.0.20 starting
+1732323791: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323791: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323791: Error opening password file "/mosquitto/data/passwd".
+1732323804: mosquitto version 2.0.20 starting
+1732323804: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323804: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323804: Error opening password file "/mosquitto/data/passwd".
+1732323831: mosquitto version 2.0.20 starting
+1732323831: Config loaded from /mosquitto/config/mosquitto.conf.
+1732323831: Error: Unable to open pwfile "/mosquitto/data/passwd".
+1732323831: Error opening password file "/mosquitto/data/passwd".