diff --git a/fems-mqtt/Dockerfile b/fems-mqtt/Dockerfile index 3890cca..b4e8b2f 100644 --- a/fems-mqtt/Dockerfile +++ b/fems-mqtt/Dockerfile @@ -3,8 +3,8 @@ FROM eclipse-mosquitto:latest ARG MQTT_USERNAME=fems ARG MQTT_PASSWORD=fems123! -ARG NODE_RED_USERNAME=nodered_user -ARG NODE_RED_PASSWORD=nodered_password123! +ARG NODE_RED_USERNAME=node_red +ARG NODE_RED_PASSWORD=nodered123! # Create directories RUN mkdir -p /mosquitto/config /mosquitto/data /mosquitto/log /mosquitto/certs @@ -17,16 +17,19 @@ COPY ./config/acl /mosquitto/config/ RUN echo '#!/bin/sh' > /docker-entrypoint.sh && \ echo 'set -e' >> /docker-entrypoint.sh && \ echo 'touch /mosquitto/data/passwd' >> /docker-entrypoint.sh && \ + echo 'chmod 600 /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 600 /mosquitto/data/passwd' >> /docker-entrypoint.sh && \ echo 'chmod 600 /mosquitto/config/acl' >> /docker-entrypoint.sh && \ + echo 'chmod -R 700 /mosquitto/log' >> /docker-entrypoint.sh && \ echo 'exec "$@"' >> /docker-entrypoint.sh && \ chmod +x /docker-entrypoint.sh -# Set permissions -RUN chown -R mosquitto:mosquitto /mosquitto +# Set initial permissions +RUN chown -R mosquitto:mosquitto /mosquitto && \ + chmod 600 /mosquitto/config/acl && \ + chmod -R 700 /mosquitto/log EXPOSE 1883 8883