From 6e933c33cf6933e61b258561e84449dd6d64a7b9 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Wed, 25 Mar 2020 15:18:05 +0100 Subject: [PATCH] Moved mosquitto and zigbee2mqtt inside homeassistant for dependency and moved certificates --- homeassistant/docker-compose.yaml.host | 45 +++++++++++++++++++++ homeassistant/docker-compose.yaml.net | 54 +++++++++++++++++++++++--- mosquitto/docker-compose.yaml | 25 ------------ traefik/docker-compose.yaml.host | 7 ++-- traefik/docker-compose.yaml.net | 5 +-- zigbee2mqtt/docker-compose.yaml | 18 --------- 6 files changed, 100 insertions(+), 54 deletions(-) delete mode 100644 mosquitto/docker-compose.yaml delete mode 100644 zigbee2mqtt/docker-compose.yaml diff --git a/homeassistant/docker-compose.yaml.host b/homeassistant/docker-compose.yaml.host index de25544..7ea29d8 100644 --- a/homeassistant/docker-compose.yaml.host +++ b/homeassistant/docker-compose.yaml.host @@ -8,6 +8,9 @@ services: restart: always ports: - 8123:8123 + depends_on: + - zigbee2mqtt + - mosquitto environment: - TZ=${DOCKER_TZ} privileged: true @@ -28,3 +31,45 @@ services: - "traefik.http.routers.homeassistant-secure.service=homeassistant" - "traefik.http.services.homeassistant.loadbalancer.server.port=8123" #- "traefik.docker.network=host" + + zigbee2mqtt: + container_name: zigbee2mqtt + image: koenkk/zigbee2mqtt + restart: always + depends_on: + - mosquitto + environment: + - TZ=${DOCKER_TZ} + privileged: true + volumes: + - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data + - /run/udev:/run/udev:ro + devices: + - /dev/ttyACM0:/dev/ttyACM0 + network_mode: host + labels: + - traefik.enable=false + + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto:latest + restart: always + #ports: + # - 1883:1883 + # - 8883:8883 + # - 8083:8083 + environment: + - TZ=${DOCKER_TZ} + #privileged: true + user: "1883:1883" + volumes: + - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data + - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config + - ${DOCKER_CFG_DIR}/mosquitto/log:/mosquitto/log + - /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 + labels: + - traefik.enable=false + diff --git a/homeassistant/docker-compose.yaml.net b/homeassistant/docker-compose.yaml.net index 0a5970e..45ad353 100644 --- a/homeassistant/docker-compose.yaml.net +++ b/homeassistant/docker-compose.yaml.net @@ -6,8 +6,11 @@ services: image: homeassistant/home-assistant:stable #command: --log-file /config/log/home-assistant.log restart: always - #ports: - # - 8123:8123 + ports: + - 8123:8123 + depends_on: + - zigbee2mqtt + - mosquitto environment: - TZ=${DOCKER_TZ} privileged: true @@ -20,9 +23,9 @@ services: - "traefik.enable=true" - "traefik.http.routers.homeassistant.entrypoints=http" - "traefik.http.routers.homeassistant.rule=Host(`home.giorgioravera.it`)" - - "traefik.http.routers.homeassistant.service=homeassistant" - #- "traefik.http.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https" - #- "traefik.http.routers.homeassistant.middlewares=homeassistant-https-redirect" + #- "traefik.http.routers.homeassistant.service=homeassistant" + - "traefik.http.middlewares.homeassistant-https-redirect.redirectscheme.scheme=https" + - "traefik.http.routers.homeassistant.middlewares=homeassistant-https-redirect" - "traefik.http.routers.homeassistant-secure.entrypoints=https" - "traefik.http.routers.homeassistant-secure.rule=Host(`home.giorgioravera.it`)" - "traefik.http.routers.homeassistant-secure.tls=true" @@ -31,6 +34,47 @@ services: - "traefik.http.services.homeassistant.loadbalancer.server.port=8123" - "traefik.docker.network=proxy" + zigbee2mqtt: + container_name: zigbee2mqtt + image: koenkk/zigbee2mqtt + restart: always + depends_on: + - mosquitto + environment: + - TZ=${DOCKER_TZ} + privileged: true + volumes: + - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data + - /run/udev:/run/udev:ro + devices: + - /dev/ttyACM0:/dev/ttyACM0 + network_mode: host + labels: + - traefik.enable=false + + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto:latest + restart: always + #ports: + # - 1883:1883 + # - 8883:8883 + # - 8083:8083 + environment: + - TZ=${DOCKER_TZ} + #privileged: true + user: "1883:1883" + volumes: + - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data + - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config + - ${DOCKER_CFG_DIR}/mosquitto/log:/mosquitto/log + - /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 + labels: + - traefik.enable=false + networks: proxy: external: true diff --git a/mosquitto/docker-compose.yaml b/mosquitto/docker-compose.yaml deleted file mode 100644 index ed0e143..0000000 --- a/mosquitto/docker-compose.yaml +++ /dev/null @@ -1,25 +0,0 @@ -version: '3' - -services: - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto:latest - restart: always - #ports: - # - 1883:1883 - # - 8883:8883 - # - 8083:8083 - environment: - - TZ=${DOCKER_TZ} - #privileged: true - user: "1883:1883" - volumes: - - ${DOCKER_CFG_DIR}/mosquitto/data:/mosquitto/data - - ${DOCKER_CFG_DIR}/mosquitto/config:/mosquitto/config - - ${DOCKER_CFG_DIR}/mosquitto/log:/mosquitto/log - - /etc/letsencrypt/live/server.giorgioravera.it/chain.pem:/certs/chain.pem - - /etc/letsencrypt/live/server.giorgioravera.it/cert.pem:/certs/cert.pem - - /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem:/certs/privkey.pem - network_mode: host - labels: - - traefik.enable=false diff --git a/traefik/docker-compose.yaml.host b/traefik/docker-compose.yaml.host index 15d7834..105a605 100644 --- a/traefik/docker-compose.yaml.host +++ b/traefik/docker-compose.yaml.host @@ -3,7 +3,7 @@ version: '3' services: traefik: container_name: traefik - image: traefik:v2.0 + image: traefik:latest # command: # - --api # - --api.dashboard @@ -24,8 +24,9 @@ services: - ${DOCKER_CFG_DIR}/traefik/passwd:/passwd - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json - ${DOCKER_CFG_DIR}/traefik/config:/config - - /etc/letsencrypt/live/server.giorgioravera.it/fullchain.pem:/certs/fullchain.pem - - /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem:/certs/privkey.pem + #- ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log + - /etc/ssl/giorgioravera.it/fullchain.pem:/certs/fullchain.pem + - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem - /var/run/docker.sock:/var/run/docker.sock network_mode: host labels: diff --git a/traefik/docker-compose.yaml.net b/traefik/docker-compose.yaml.net index a10c9b6..a16cdbc 100644 --- a/traefik/docker-compose.yaml.net +++ b/traefik/docker-compose.yaml.net @@ -4,7 +4,6 @@ services: traefik: container_name: traefik image: traefik:latest - #image: traefik:v2.0 # command: # - --api # - --api.dashboard @@ -26,8 +25,8 @@ services: - ${DOCKER_CFG_DIR}/traefik/acme.json:/acme.json - ${DOCKER_CFG_DIR}/traefik/config:/config #- ${DOCKER_CFG_DIR}/traefik/traefik.log:/traefik.log - - /etc/letsencrypt/live/server.giorgioravera.it/fullchain.pem:/certs/fullchain.pem - - /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem:/certs/privkey.pem + - /etc/ssl/giorgioravera.it/fullchain.pem:/certs/fullchain.pem + - /etc/ssl/giorgioravera.it/privkey.pem:/certs/privkey.pem - /var/run/docker.sock:/var/run/docker.sock networks: proxy: diff --git a/zigbee2mqtt/docker-compose.yaml b/zigbee2mqtt/docker-compose.yaml deleted file mode 100644 index 9776e44..0000000 --- a/zigbee2mqtt/docker-compose.yaml +++ /dev/null @@ -1,18 +0,0 @@ -version: '3' - -services: - zigbee2mqtt: - container_name: zigbee2mqtt - image: koenkk/zigbee2mqtt - restart: always - environment: - - TZ=${DOCKER_TZ} - privileged: true - volumes: - - ${DOCKER_CFG_DIR}/zigbee2mqtt:/app/data - - /run/udev:/run/udev:ro - devices: - - /dev/ttyACM0:/dev/ttyACM0 - network_mode: host - labels: - - traefik.enable=false -- 2.47.3