Merge pull request SensorsIot#351 from Paraphraser/20210521-mosquitto-oldmenu

Self-healing Mosquitto (Dockerfile build) - PR 2 of 2 - old-menu branch

Author: Slyke

.templates/mosquitto/Dockerfile

@@ -0,0 +1,22 @@
+# Download base image
+FROM eclipse-mosquitto:latest
+
+# Add support tools
+RUN apk update && apk add --no-cache rsync tzdata
+
+# where IOTstack template files are stored
+ENV IOTSTACK_DEFAULTS_DIR="iotstack_defaults"
+
+# copy template files to image
+COPY --chown=mosquitto:mosquitto ${IOTSTACK_DEFAULTS_DIR} /${IOTSTACK_DEFAULTS_DIR}
+
+# replace the docker entry-point script
+ENV IOTSTACK_ENTRY_POINT="docker-entrypoint.sh"
+COPY ${IOTSTACK_ENTRY_POINT} /${IOTSTACK_ENTRY_POINT}
+RUN chmod 755 /${IOTSTACK_ENTRY_POINT}
+ENV IOTSTACK_ENTRY_POINT=
+
+# IOTstack also declares these paths
+VOLUME ["/mosquitto/config", "/mosquitto/pwfile"]
+
+# EOF

.templates/mosquitto/directoryfix.sh

@@ -0,0 +1,15 @@
+#!/bin/ash
+set -e
+
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' -a -d "/mosquitto" ]; then
+
+   rsync -arp --ignore-existing /${IOTSTACK_DEFAULTS_DIR}/ "/mosquitto"
+
+   chown -R mosquitto:mosquitto /mosquitto
+   
+fi
+
+exec "$@"
+

.templates/mosquitto/docker-entrypoint.sh

@@ -1,12 +1,13 @@
   mosquitto:
     container_name: mosquitto
-    image: eclipse-mosquitto
+    build: ./.templates/mosquitto/.
     restart: unless-stopped
-    user: "1883"
+    environment:
+      - TZ=Etc/UTC
     ports:
       - "1883:1883"
     volumes:
+      - ./volumes/mosquitto/config:/mosquitto/config
       - ./volumes/mosquitto/data:/mosquitto/data
       - ./volumes/mosquitto/log:/mosquitto/log
       - ./volumes/mosquitto/pwfile:/mosquitto/pwfile
-      - ./services/mosquitto:/mosquitto/config:ro