From c89623aba16992db8cd8c52f3b7a8c7fdf377074 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Thu, 6 Jul 2023 19:52:59 +1000 Subject: [PATCH] clean up of older containers wont use again like alert-manager, also fixed the hass issue where each new container breaks command line authentication --- docker-compose.yml | 119 ++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 73 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1bed413..02ffd02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -399,7 +399,7 @@ services: - "32400:32400" hass: - image: homeassistant/home-assistant + image: ghcr.io/home-assistant/home-assistant:stable container_name: hass privileged: true network_mode: host @@ -411,22 +411,14 @@ services: - openldap volumes: - /srv/docker/container/hass:/config + # this line adds known hosts file to /root's .ssh so the 'command line authenticaion' works on login on every new container + - /srv/docker/container/hass/ssh/known_hosts:/root/.ssh/known_hosts - /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.http.services.hass.loadbalancer.server.port=8123" -# - "traefik.http.routers.hass.entrypoints=secureweb" -# - "traefik.http.routers.hass.tls.options=tls12@file" - # 8123 == main port, 3610??? -# ports: -# - "8123:8123" -# - "3610:3610/udp" mass: image: ghcr.io/music-assistant/server @@ -448,8 +440,6 @@ services: - "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" mosquitto: container_name: mosquitto @@ -474,7 +464,6 @@ services: 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" @@ -482,7 +471,6 @@ services: - "traefik.http.routers.esphome.middlewares=stripprefix-esphome@docker" restart: always privileged: true -# network_mode: host ports: - "6052:6052" @@ -541,7 +529,6 @@ services: - "traefik.http.routers.prometheus.entrypoints=web" links: - cadvisor:cadvisor -# - alertmanager:alertmanager - node-exporter:node-exporter - blackbox_exporter:blackbox_exporter ports: @@ -568,20 +555,6 @@ services: - "/var/lib/node_exporter/textfile_collector" restart: always -# alertmanager: -# image: prom/alertmanager:latest -# container_name: alertmanager -# ports: -# - 9093:9093 -# labels: -# - "com.centurylinklabs.watchtower.enable=true" -# volumes: -# - /srv/docker/container/alertmanager/:/alertmanager -# restart: always -# command: -# - '--config.file=/alertmanager/config.yml' -# - '--storage.path=/alertmanager' - cadvisor: image: gcr.io/cadvisor/cadvisor:latest container_name: cadvisor @@ -603,8 +576,6 @@ services: blackbox_exporter: image: prom/blackbox-exporter container_name: blackbox-exporter:latest -# ports: -# - 9115:9115 command: - '--config.file=/etc/blackboxexporter/config.yml' labels: @@ -794,6 +765,8 @@ services: tix: container_name: tix restart: always + environment: + ENV: "production" build: context: '/home/ddp/src/snow-ticket-analysis' args: @@ -801,7 +774,7 @@ services: PJM_GID: 500 volumes: - /srv/docker/container/letsencrypt/etc:/etc/letsencrypt - - /srv/docker/container/tix/stats.db:/stats.db + - /home/ddp/src/snow-ticket-analysis/stats.db:/stats.db - /etc/localtime:/etc/localtime:ro labels: - "com.centurylinklabs.watchtower.enable=false" @@ -992,16 +965,16 @@ services: - /srv/docker/container/ark-server:/app - /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups environment: - - "SESSION_NAME=Aberration Server - ARK" - - "SERVER_MAP=Aberration_P" - - "SERVER_PASSWORD=ThisGameSucks" + - "SESSION_NAME=The Island - ARK" + - "SERVER_MAP=TheIsland" + - "SERVER_PASSWORD=bagrid" - "ADMIN_PASSWORD=arkadminpassword" - - "MAX_PLAYERS=3" + - "MAX_PLAYERS=5" - "UPDATE_ON_START=false" - "BACKUP_ON_STOP=true" - "PRE_UPDATE_BACKUP=true" - "WARN_ON_STOP=true" - - "GAME_MOD_IDS=731604991,2182894352,821530042,1404697612,895711211" + - "GAME_MOD_IDS=1404697612,1428596566,772235118,895711211" ports: # Port for connections from ARK game client - "7777:7777/udp" @@ -1013,41 +986,41 @@ services: - "27015:27015/udp" # php wordpress (use traefik for https ssl offload) - mimosa-clinic: - restart: always - container_name: mimosa-clinic - image: wordpress:latest - links: - - mimosa-db:mysql - environment: - - WORDPRESS_DB_PASSWORD=badf)gaklsdjf77@(6234a - - WORDPRESS_DB_USER=root - ports: - - "8787:80" - volumes: - - /srv/docker/container/mimosa-clinic/www-data:/var/www/html - labels: - - "com.centurylinklabs.watchtower.enable=true" - - "traefik.enable=true" - - "traefik.http.routers.mimosa.entrypoints=secureweb" - - "traefik.http.routers.mimosa.rule=Host(`mimosa.depaoli.id.au`)" - - "traefik.http.routers.mimosa.tls=true" - - "traefik.http.routers.mimosa-http.entrypoints=web" - - "traefik.http.routers.mimosa-http.rule=Host(`mimosa.depaoli.id.au`)" - - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.scheme=https" - - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.permanent=true" - - "traefik.http.routers.mimosa-http.middlewares=mimosa-http-redirect@docker" - mimosa-db: - restart: always - container_name: mimosa-db - image: mariadb:latest - environment: - - MYSQL_ROOT_PASSWORD=badf)gaklsdjf77@(6234a - - MYSQL_DATABASE=wordpress - labels: - - "com.centurylinklabs.watchtower.enable=true" - volumes: - - /srv/docker/container/mimosa-clinic/database:/var/lib/mysql +# mimosa-clinic: +# restart: always +# container_name: mimosa-clinic +# image: wordpress:latest +# links: +# - mimosa-db:mysql +# environment: +# - WORDPRESS_DB_PASSWORD=badf)gaklsdjf77@(6234a +# - WORDPRESS_DB_USER=root +# ports: +# - "8787:80" +# volumes: +# - /srv/docker/container/mimosa-clinic/www-data:/var/www/html +# labels: +# - "com.centurylinklabs.watchtower.enable=true" +# - "traefik.enable=true" +# - "traefik.http.routers.mimosa.entrypoints=secureweb" +# - "traefik.http.routers.mimosa.rule=Host(`mimosa.depaoli.id.au`)" +# - "traefik.http.routers.mimosa.tls=true" +# - "traefik.http.routers.mimosa-http.entrypoints=web" +# - "traefik.http.routers.mimosa-http.rule=Host(`mimosa.depaoli.id.au`)" +# - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.scheme=https" +# - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.permanent=true" +# - "traefik.http.routers.mimosa-http.middlewares=mimosa-http-redirect@docker" +# mimosa-db: +# restart: always +# container_name: mimosa-db +# image: mariadb:latest +# environment: +# - MYSQL_ROOT_PASSWORD=badf)gaklsdjf77@(6234a +# - MYSQL_DATABASE=wordpress +# labels: +# - "com.centurylinklabs.watchtower.enable=true" +# volumes: +# - /srv/docker/container/mimosa-clinic/database:/var/lib/mysql kuma: image: louislam/uptime-kuma:latest