fix:(mosquitto): configs

apps/eclipse-mosquitto/docker-compose.yml

@@ -1,6 +1,26 @@
 version: '3.7'
 
 services:
+  eclipse-mosquitto:
+    image: eclipse-mosquitto:2.0.18
+    container_name: eclipse-mosquitto
+    environment:
+      - TZ=${TZ}
+      - MQTT_DYNSEC_ADMIN_USER=admin
+      - MQTT_DYNSEC_ADMIN_PASSWORD=${MQTT_ADMIN_PASSWORD}
+    ports:
+      - 1883:1883
+    command: ['/dynsec-setup.sh', '/usr/sbin/mosquitto', '-c', '/mosquitto/config/mosquitto.conf']
+    expose:
+      - 1883
+    volumes:
+      - ${APP_DATA_DIR}/data/data:/mosquitto/data
+      - ${APP_DATA_DIR}/data/config:/mosquitto/config
+      - ${APP_DATA_DIR}/data/scripts/dynsec-setup.sh:/dynsec-setup.sh
+    restart: unless-stopped
+    networks:
+      - tipi_main_network
+
   mosquitto-management-center:
     image: cedalo/management-center:dev
     container_name: mosquitto-management-center
@@ -18,7 +38,7 @@ services:
     expose:
       - 8088
     depends_on:
-      - mosquitto-broker
+      - eclipse-mosquitto
     networks:
       - tipi_main_network
     restart: unless-stopped
@@ -47,22 +67,3 @@ services:
       traefik.http.routers.mosquitto-local.entrypoints: websecure
       traefik.http.routers.mosquitto-local.service: mosquitto-web
       traefik.http.routers.mosquitto-local.tls: true
-  mosquitto-broker:
-    image: eclipse-mosquitto:2.0.18
-    container_name: mosquitto-broker
-    environment:
-      - TZ=${TZ}
-      - MQTT_DYNSEC_ADMIN_USER=admin
-      - MQTT_DYNSEC_ADMIN_PASSWORD=${MQTT_ADMIN_PASSWORD}
-    ports:
-      - 1883:1883
-    command: ["/dynsec-setup.sh",  "/usr/sbin/mosquitto", "-c", "/mosquitto/config/mosquitto.conf"]
-    expose:
-      - 1883
-    volumes:
-      - ${APP_DATA_DIR}/data/data:/mosquitto/data
-      - ${APP_DATA_DIR}/data/config:/mosquitto/config
-      - ${APP_DATA_DIR}/data/scripts/dynsec-setup.sh:/dynsec-setup.sh
-    restart: unless-stopped
-    networks:
-      - tipi_main_network

apps/zigbee2mqtt/config.json

@@ -6,11 +6,8 @@
   "exposable": true,
   "id": "zigbee2mqtt",
   "tipi_version": 1,
-  "version": "1.35",
-  "categories": [
-    "utilities", 
-    "automation"
-  ],
+  "version": "1.35.3",
+  "categories": ["utilities", "automation"],
   "description": "Zigbee to MQTT bridge, get rid of your proprietary Zigbee bridges",
   "short_desc": "Zigbee to MQTT bridge",
   "author": "@Koenkk",
@@ -25,8 +22,5 @@
       "env_variable": "Z2M_DEVICE"
     }
   ],
-  "supported_architectures": [
-    "arm64",
-    "amd64"
-  ]
+  "supported_architectures": ["arm64", "amd64"]
 }

apps/zigbee2mqtt/docker-compose.yml

@@ -1,10 +1,9 @@
-version: "3.7"
+version: '3.7'
 
 services:
-
   zigbee2mqtt:
     container_name: zigbee2mqtt
-    image: koenkk/zigbee2mqtt:1.35
+    image: koenkk/zigbee2mqtt:1.35.3
     environment:
       - TZ=${TZ}
     volumes:
@@ -16,6 +15,8 @@ services:
     expose:
       - 8080
     restart: unless-stopped
+    networks:
+      - tipi_main_network
     labels:
       # Main
       traefik.enable: true