Merge branch 'master' into pr/72

Author: Slyke

.gitignore

@@ -3,7 +3,9 @@
 /volumes/
 /backups/
 /.tmp/*
+__pycache__
 docker-compose.yml
+compose-override.yml
 .outofdate
 
 !.gitkeep

.templates/adminer/service.yml

@@ -3,4 +3,4 @@
     image: adminer
     restart: unless-stopped
     ports:
-      - 9080:8080
+      - "9080:8080"

.templates/blynk_server/service.yml

@@ -3,9 +3,8 @@
     container_name: blynk_server
     restart: unless-stopped
     ports:
-      - 8180:8080
-      - 8441:8441
-      - 9443:9443
+      - "8180:8080"
+      - "8441:8441"
+      - "9443:9443"
     volumes:
       - ./volumes/blynk_server/data:/data
-

.templates/domoticz/domoticz.env

@@ -0,0 +1,4 @@
+PUID=1000
+PGID=1000
+#TZ=
+#WEBROOT=domoticz #optional

.templates/domoticz/service.yml

@@ -0,0 +1,14 @@
+  domoticz:
+    container_name: domoticz
+    image: linuxserver/domoticz:stable
+    ports:
+      - "8080:8080"
+      - "6144:6144"
+      - "1443:1443"
+    volumes:
+      - ./volumes/domoticz/data:/config
+    env_file:
+      - ./services/domoticz/domoticz.env      
+    restart: unless-stopped
+    network_mode: bridge
+    

.templates/dozzle/service.yml

@@ -4,6 +4,6 @@
     restart: unless-stopped
     network_mode: host
     ports:
-      - 8888:8080
+      - "8888:8080"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

.templates/grafana/service.yml

@@ -4,7 +4,7 @@
     restart: unless-stopped
     user: "0"
     ports:
-      - 3000:3000
+      - "3000:3000"
     env_file:
       - ./services/grafana/grafana.env
     volumes:

.templates/influxdb/service.yml

@@ -3,9 +3,9 @@
     image: "influxdb:latest"
     restart: unless-stopped
     ports:
-      - 8086:8086
-      - 8083:8083
-      - 2003:2003
+      - "8086:8086"
+      - "8083:8083"
+      - "2003:2003"
     env_file:
       - ./services/influxdb/influxdb.env
     volumes:

.templates/mariadb/service.yml

@@ -6,6 +6,5 @@
     volumes:
       - ./volumes/mariadb/config:/config
     ports:
-      - 3306:3306
+      - "3306:3306"
     restart: unless-stopped
-

.templates/mosquitto/directoryfix.sh

@@ -7,6 +7,7 @@ if [ $(grep -c 'user: \"1883\"' ./services/mosquitto/service.yml) -eq 1 ]; then
 	echo "...found user 1883"
 	sudo mkdir -p ./volumes/mosquitto/data/
 	sudo mkdir -p ./volumes/mosquitto/log/
+	sudo mkdir -p ./volumes/mosquitto/pwfile/
 	sudo chown -R 1883:1883 ./volumes/mosquitto/
 fi