From a9ac26c54961c2acb84e6f67a66797a34284d209 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sun, 11 Jun 2023 11:26:30 +1000 Subject: [PATCH] added new tix home built python server for work ticket trends, added music assistant (mass) as a seperate container, used traefik to route hass again and put esphome and mass as URLs off hass.depaoli.id.au --- docker-compose.yml | 70 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f496543..e95c6e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -402,7 +402,7 @@ services: image: homeassistant/home-assistant container_name: hass privileged: true - network_mode: host +# network_mode: host restart: always security_opt: - seccomp:unconfined @@ -411,23 +411,45 @@ services: - openldap volumes: - /srv/docker/container/hass:/config - - /export/docker/storage/music/:/music - /var/run/docker.sock:/var/run/docker.sock - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket - /etc/localtime:/etc/localtime:ro - /run/dbus:/run/dbus:ro labels: - "com.centurylinklabs.watchtower.enable=false" -# - "traefik.enable=true" -# - "traefik.http.routers.hass.rule=Host(`hass.depaoli.id.au`)" -# - "traefik.http.routers.hass.tls=true" + - "traefik.enable=true" + - "traefik.http.routers.hass.rule=Host(`hass.depaoli.id.au`)" + - "traefik.http.routers.hass.tls=true" + - "traefik.http.services.hass.loadbalancer.server.port=8123" + - "traefik.http.routers.hass.entrypoints=secureweb" # - "traefik.http.routers.hass.tls.options=tls12@file" -# - "traefik.http.services.hass.loadbalancer.server.port=8123" -# - "traefik.http.routers.hass.entrypoints=secureweb" + # 8123 == main port, 3610??? + ports: + - "8123:8123" + - "3610:3610/udp" + + mass: + image: ghcr.io/music-assistant/server + container_name: mass + restart: always + network_mode: host + depends_on: + - pihole + volumes: + - /srv/docker/container/mass/data:/data + - /export/docker/storage/music:/music + - /etc/localtime:/etc/localtime:ro + labels: + - "com.centurylinklabs.watchtower.enable=true" + - "traefik.enable=true" + - "traefik.http.routers.mass.rule=Host(`hass.depaoli.id.au`) && PathPrefix(`/mass/`)" + - "traefik.http.routers.mass.tls=true" + - "traefik.http.routers.mass.entrypoints=secureweb" + - "traefik.http.middlewares.stripprefix-mass.stripprefix.prefixes=/mass" + - "traefik.http.routers.mass.middlewares=stripprefix-mass@docker" + - "traefik.http.services.mass.loadbalancer.server.port=8095" # ports: # - "8095:8095" -# - "8123:8123" -# - "3610:3610/udp" mosquitto: container_name: mosquitto @@ -451,9 +473,18 @@ services: - /etc/localtime:/etc/localtime:ro labels: - "com.centurylinklabs.watchtower.enable=true" + - "traefik.enable=true" +# - "traefik.http.routers.esphome.rule=Host(`mara.ddp.net`) && PathPrefix(`/esphome/`)" + - "traefik.http.routers.esphome.rule=Host(`hass.depaoli.id.au`) && PathPrefix(`/esphome/`)" + - "traefik.http.routers.esphome.tls=true" + - "traefik.http.routers.esphome.entrypoints=secureweb" + - "traefik.http.middlewares.stripprefix-esphome.stripprefix.prefixes=/esphome" + - "traefik.http.routers.esphome.middlewares=stripprefix-esphome@docker" restart: always privileged: true - network_mode: host +# network_mode: host + ports: + - "6052:6052" sabnzbd: image: linuxserver/sabnzbd @@ -740,6 +771,25 @@ services: - "traefik.tcp.routers.paweb-tcp.tls.passthrough=true" - "traefik.tcp.routers.paweb-tcp.entrypoints=secureweb" + tix: + container_name: tix + restart: always + build: + context: '/home/ddp/src/snow-ticket-analysis' + args: + PJM_UID: 500 + PJM_GID: 500 + volumes: + - /srv/docker/container/letsencrypt/etc:/etc/letsencrypt + - /srv/docker/container/tix/stats.db:/stats.db + - /etc/localtime:/etc/localtime:ro + labels: + - "com.centurylinklabs.watchtower.enable=false" + - "traefik.enable=true" + - "traefik.tcp.routers.tix-tcp.rule=HostSNI(`tix.depaoli.id.au`)" + - "traefik.tcp.routers.tix-tcp.tls.passthrough=true" + - "traefik.tcp.routers.tix-tcp.entrypoints=secureweb" + vaultwarden: container_name: bitwarden restart: always