Compare commits

..

No commits in common. "92ef21b414b56ad1ff35ce1727de9be226181e44" and "cea4680240fbcefa1b7ee5686462dbedcea12a19" have entirely different histories.

4 changed files with 23 additions and 42 deletions

View file

@ -1,4 +1,4 @@
FROM debian:bookworm FROM debian:bullseye
# Install Packages (basic tools, cups, basic drivers, HP drivers) # Install Packages (basic tools, cups, basic drivers, HP drivers)
RUN apt-get update \ RUN apt-get update \

View file

@ -16,41 +16,30 @@ services:
- "traefik.http.services.hassi.loadbalancer.server.port=8123" - "traefik.http.services.hassi.loadbalancer.server.port=8123"
- "docker.group=smartHome" - "docker.group=smartHome"
mqttbroker: deconz:
image: eclipse-mosquitto:2.0 image: deconzcommunity/deconz:stable
restart: unless-stopped
network_mode: host network_mode: host
expose: privileged: true
- 1883
#ports:
# - 1883:1883 # mqtt over TCP
# - 9001:9001 # Websockets
volumes:
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf
- ${VOLUMES_PATH}/smartHome/mosquitto/data:/mosquitto/data
- ${VOLUMES_PATH}/smartHome/mosquitto/log:/mosquitto/log
zigbee2mqtt:
restart: unless-stopped restart: unless-stopped
image: koenkk/zigbee2mqtt
volumes: volumes:
- ${VOLUMES_PATH}/smartHome/zigbee2mqtt:/app/data - ${VOLUMES_PATH}/deCONZ:/opt/deCONZ
- /run/udev:/run/udev:ro - /etc/localtime:/etc/localtime:ro
environment:
- TZ=Europe/Berlin
devices: devices:
- /dev/ttyACM0:/dev/ttyACM0 - /dev/ttyACM0
networks: environment:
- web - DECONZ_DEVICE=/dev/ttyACM0
- DECONZ_WEB_PORT=8080
- DECONZ_WS_PORT=8443
- DEBUG_INFO=1
- DEBUG_APS=0
- DEBUG_ZCL=0
- DEBUG_ZDP=0
- DEBUG_OTAU=0
- TZ=Europe/Berlin
- UDEV=1
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.zigbee2mqtt.rule=Host(`zigbee2mqtt.${DOMAIN}`)" - "traefik.http.routers.deconz.rule=Host(`deconz.${DOMAIN}`)"
- "traefik.http.routers.zigbee2mqtt.entrypoints=web" - "traefik.http.routers.deconz.entrypoints=web"
- "traefik.http.services.zigbee2mqtt.loadbalancer.server.port=8080" - "traefik.http.services.deconz.loadbalancer.server.port=8080"
- "docker.group=smartHome" - "docker.group=smartHome"
networks:
web:
external: true

View file

@ -1,8 +0,0 @@
persistence true
persistence_location /mosquitto/data
log_dest file /mosquitto/log/mosquitto.log
listener 1883
allow_anonymous true
listener 9001
protocol websockets

View file

@ -1,7 +1,7 @@
services: services:
host: host:
image: telegraf:${TELEGRAF_VERSION} image: telegraf:1.18
restart: unless-stopped restart: unless-stopped
environment: environment:
- HOST_MOUNT_PREFIX=/hostfs - HOST_MOUNT_PREFIX=/hostfs
@ -19,7 +19,7 @@ services:
- "docker.group=telegraf" - "docker.group=telegraf"
net: net:
image: telegraf:${TELEGRAF_VERSION} image: telegraf:1.18
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./telegraf_net.conf:/etc/telegraf/telegraf.conf:ro - ./telegraf_net.conf:/etc/telegraf/telegraf.conf:ro