diff --git a/docker-compose.db.yml b/docker-compose.db.yml index dabc45e..bd95f63 100644 --- a/docker-compose.db.yml +++ b/docker-compose.db.yml @@ -100,15 +100,17 @@ services: - MQTT_PASSWORD=${MQTT_PASSWORD} container_name: fems-mqtt restart: unless-stopped + env_file: + - .env.${NODE_ENV:-development} ports: - "${MQTT_PORT}:1883" - "${MQTT_WSS_PORT}:8883" volumes: - ./fems-mqtt/data:/mosquitto/data + - ./fems-mqtt/config:/mosquitto/config - ./fems-mqtt/log:/mosquitto/log - ./fems-mqtt/certs:/mosquitto/certs environment: - - TZ=Asia/Seoul - MQTT_USERNAME=${MQTT_USERNAME} - MQTT_PASSWORD=${MQTT_PASSWORD} healthcheck: diff --git a/fems-mqtt/Dockerfile b/fems-mqtt/Dockerfile index ddbc4f6..a27c59a 100644 --- a/fems-mqtt/Dockerfile +++ b/fems-mqtt/Dockerfile @@ -18,7 +18,7 @@ RUN echo '#!/bin/sh' > /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 'chmod -R 700 /mosquitto/log' >> /docker-entrypoint.sh && \ echo 'exec "$@"' >> /docker-entrypoint.sh && \ chmod +x /docker-entrypoint.sh diff --git a/fems-mqtt/data/mosquitto.db b/fems-mqtt/data/mosquitto.db index 27fba99..f205c7c 100644 Binary files a/fems-mqtt/data/mosquitto.db and b/fems-mqtt/data/mosquitto.db differ diff --git a/fems-mqtt/log/mosquitto.log b/fems-mqtt/log/mosquitto.log index 24473b2..3ff916e 100755 --- a/fems-mqtt/log/mosquitto.log +++ b/fems-mqtt/log/mosquitto.log @@ -14617,3 +14617,11 @@ To fix this, use `chmod 0700 /mosquitto/config/passwd`. 1732324055: Opening ipv4 listen socket on port 1884. 1732324055: Opening ipv6 listen socket on port 1884. 1732324055: mosquitto version 2.0.20 running +1732330743: mosquitto version 2.0.20 starting +1732330743: Config loaded from /mosquitto/config/mosquitto.conf. +1732330743: Warning: Invalid line in password file '/mosquitto/data/passwd': :$7$101$Fcs7FsY2fqKvjA+b$0Mf+CPi5H17OO/Wp45OWU5jnTo6uDxRn5FUk4eIGMiiiifmr8JZNQ4Zs4sF7VLCDw+fegUo8HWVoJL3BBQYKNA== +1732330743: Warning: ACL pattern 'fems/#' does not contain '%c' or '%u'. +1732330743: Opening ipv4 listen socket on port 1884. +1732330743: Opening ipv6 listen socket on port 1884. +1732330743: mosquitto version 2.0.20 running +1732332544: Saving in-memory database to /mosquitto/data//mosquitto.db.