Removed privileges to homeassistant, migrated other services to bridge

diff --git a/homeassistant/docker-compose.yaml.host b/homeassistant/docker-compose.yaml.host
index 64cd9228ae8f022eed7919b189bf25dca2a7de92..376ad0aaf1f8ad0ab9ade7da96889364db211b00 100644 (file)
--- a/homeassistant/docker-compose.yaml.host
+++ b/homeassistant/docker-compose.yaml.host
@@ -13,8 +13,7 @@ services:
       - mosquitto
     environment:
       - TZ=${DOCKER_TZ}
-    privileged: true
-    #user: "1001:1000"
+    #privileged: true
     dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/homeassistant:/config
@@ -42,13 +41,13 @@ services:
     environment:
       - TZ=${DOCKER_TZ}
     privileged: true
-    dns: 192.168.0.254 192.168.0.1
     volumes:
       - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data
       - /run/udev:/run/udev:ro
     devices:
       - /dev/ttyACM0:/dev/ttyACM0
-    network_mode: host
+    networks:
+      - proxy
     labels:
     - traefik.enable=false
 
@@ -56,15 +55,13 @@ services:
     container_name: mosquitto
     image: eclipse-mosquitto:latest
     restart: always
-    #ports:
-    #  - 1883:1883
-    #  - 8883:8883
-    #  - 8083:8083
+    ports:
+      - 1883:1883
+      - 8883:8883
+      - 8083:8083
     environment:
       - TZ=${DOCKER_TZ}
-    #privileged: true
-    user: "1883:1883"
-    dns: 192.168.0.254 192.168.0.1
+    #user: "1883:1883"
     volumes:
       - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data
       - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config
@@ -72,6 +69,11 @@ services:
       - /etc/ssl/giorgioravera.it/chain.pem:/certs/chain.pem
       - /etc/ssl/giorgioravera.it/cert.pem:/certs/cert.pem
       - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem
-    network_mode: host
+    networks:
+      - proxy
     labels:
     - traefik.enable=false
+
+networks:
+  proxy:
+    external: true

diff --git a/homeassistant/docker-compose.yaml.net b/homeassistant/docker-compose.yaml.net
index 6b7492f5276f9ec3f40f098aa0687988996a4eb2..7a27bdaf76fa7eaa4b0f7ae74e80e097af70f026 100644 (file)
--- a/homeassistant/docker-compose.yaml.net
+++ b/homeassistant/docker-compose.yaml.net
@@ -13,7 +13,7 @@ services:
       - mosquitto
     environment:
       - TZ=${DOCKER_TZ}
-    privileged: true
+    #privileged: true
     #user: "1001:1000"
     dns: 192.168.0.254 192.168.0.1
     volumes: