include mosquitto mqtt server

Author: glynhudson

docker-compose.override.yml

@@ -22,8 +22,8 @@ services:
       - 'default.docker-env'
 
   # Consider adding mosquitto broker
-  # mqtt:
-  #   ports:
-  #     - 1884:1883
-  #   env_file:
-  #     - 'default.docker-env'
+  mqtt:
+    ports:
+      - 1884:1883
+    env_file:
+      - 'default.docker-env'

docker-compose.yml

@@ -20,7 +20,7 @@ services:
   # MYSQL Database
   db:
     # Official MYSQL docker image
-    image: mariadb:latest
+    image: mariadb:11.0
     environment:
       - "MYSQL_HOST=localhost"
       - "MARIADB_AUTO_UPGRADE=1"
@@ -34,22 +34,22 @@ services:
 
   redis:
     # Official redis image
-    image: redis:latest
+    image: redis:7.0
     volumes:
       - emon-redis-data:/data
     logging:
       driver: json-file
       options:
         max-size: "10m"
-
-  # Consider including mosquitto broker service
-  # Needs to be running elsewhere otherwise
-  # but maybe thats best.. 
-  
-  # mqtt:
-  #   image: eclipse-mosquitto:latest
-  #   build: mqtt/.
-  #   restart: always
+          
+  mqtt:
+    image: eclipse-mosquitto:2.0
+    build: mqtt/.
+    restart: always
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
 
 volumes:
   emon-phpfiwa:

mqtt/Dockerfile

@@ -1,5 +1,5 @@
-FROM eclipse-mosquitto:latest
-
+FROM eclipse-mosquitto:2.0
+COPY mosquitto.conf /mosquitto/config/mosquitto.conf
 COPY setup.sh /
 RUN chmod +x /setup.sh
 RUN /setup.sh

mqtt/mosquitto.conf

@@ -0,0 +1,16 @@
+persistence false
+allow_anonymous false
+password_file /mosquitto/config/passwd
+
+
+log_timestamp true
+log_timestamp_format %Y-%m-%dT%H:%M:%S
+log_type error
+log_type warning
+log_type notice
+log_type information
+log_dest file /mosquitto/log/mosquitto.log
+log_dest stdout
+
+listener 1883
+

mqtt/setup.sh

@@ -1,12 +1,3 @@
-# Disable mosquitto persistance
-sed -i "s/^persistence true/persistence false/" /mosquitto/config/mosquitto.conf
-# append line: allow_anonymous false
-sed -i -n '/allow_anonymous false/!p;$a allow_anonymous false' /mosquitto/config/mosquitto.conf
-# append line: password_file /etc/mosquitto/passwd
-sed -i -n '/password_file \/mosquitto\/config\/passwd/!p;$a password_file \/mosquitto\/config\/passwd' /mosquitto/config/mosquitto.conf
-# append line: log_type error
-sed -i -n '/log_type error/!p;$a log_type error' /mosquitto/config/mosquitto.conf
-
 # Create mosquitto password file
 touch /mosquitto/config/passwd
 mosquitto_passwd -b /mosquitto/config/passwd emonpi emonpimqtt2016