fzirker/homeserver
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

mqtt and zigbee non host mode

Browse source
This commit is contained in:
Florian Zirker 2024-10-08 13:18:15 +02:00
parent 506aad3da5
commit fdd4b6faf1
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proxy/docker-compose.yaml
View file

@ -19,7 +19,7 @@ services:
- "traefik.http.services.traefik.loadbalancer.server.port=8080" - "traefik.http.services.traefik.loadbalancer.server.port=8080"
- "docker.group=proxy" - "docker.group=proxy"
extra_hosts: extra_hosts:
- host.docker.internal:172.17.0.1 - host.docker.internal:host-gateway
depends_on: depends_on:
- docker-socket-proxy - docker-socket-proxy
@ -27,12 +27,12 @@ services:
docker-socket-proxy: docker-socket-proxy:
image: tecnativa/docker-socket-proxy image: tecnativa/docker-socket-proxy
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
environment: environment:
# grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections # grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections
- CONTAINERS=1 - CONTAINERS=1
- INFO=1 - INFO=1
networks: networks:
- dockersocket - dockersocket
privileged: true privileged: true

12
smartHome/docker-compose.yaml
View file

@ -16,14 +16,14 @@ services:
- "traefik.http.services.hassi.loadbalancer.server.port=8123" - "traefik.http.services.hassi.loadbalancer.server.port=8123"
- "docker.group=smartHome" - "docker.group=smartHome"
mqttbroker: mqttbroker:
image: eclipse-mosquitto:${MOSQUITTO_VERSION} image: eclipse-mosquitto:${MOSQUITTO_VERSION}
restart: unless-stopped restart: unless-stopped
network_mode: host networks:
expose: - smarthome
- 1883 ports:
#ports: - 1883:1883 # mqtt over TCP
# - 1883:1883 # mqtt over TCP
# - 9001:9001 # Websockets # - 9001:9001 # Websockets
volumes: volumes:
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf - ./mosquitto.conf:/mosquitto/config/mosquitto.conf
@ -43,6 +43,7 @@ services:
- ${ZIGBEE_DEVICE}:/dev/ttyACM0 - ${ZIGBEE_DEVICE}:/dev/ttyACM0
networks: networks:
- web - web
- smarthome
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.zigbee2mqtt.rule=Host(`zigbee2mqtt.${DOMAIN}`)" - "traefik.http.routers.zigbee2mqtt.rule=Host(`zigbee2mqtt.${DOMAIN}`)"
@ -54,3 +55,4 @@ services:
networks: networks:
web: web:
external: true external: true
smarthome: