clean up of older containers wont use again like alert-manager, also fixed the hass issue where each new container breaks command line authentication

This commit is contained in:
2023-07-06 19:52:59 +10:00
parent e96f56e7a8
commit c89623aba1

View File

@@ -399,7 +399,7 @@ services:
- "32400:32400" - "32400:32400"
hass: hass:
image: homeassistant/home-assistant image: ghcr.io/home-assistant/home-assistant:stable
container_name: hass container_name: hass
privileged: true privileged: true
network_mode: host network_mode: host
@@ -411,22 +411,14 @@ services:
- openldap - openldap
volumes: volumes:
- /srv/docker/container/hass:/config - /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/docker.sock:/var/run/docker.sock
- /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /run/dbus:/run/dbus:ro - /run/dbus:/run/dbus:ro
labels: labels:
- "com.centurylinklabs.watchtower.enable=false" - "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: mass:
image: ghcr.io/music-assistant/server image: ghcr.io/music-assistant/server
@@ -448,8 +440,6 @@ services:
- "traefik.http.middlewares.stripprefix-mass.stripprefix.prefixes=/mass" - "traefik.http.middlewares.stripprefix-mass.stripprefix.prefixes=/mass"
- "traefik.http.routers.mass.middlewares=stripprefix-mass@docker" - "traefik.http.routers.mass.middlewares=stripprefix-mass@docker"
- "traefik.http.services.mass.loadbalancer.server.port=8095" - "traefik.http.services.mass.loadbalancer.server.port=8095"
# ports:
# - "8095:8095"
mosquitto: mosquitto:
container_name: mosquitto container_name: mosquitto
@@ -474,7 +464,6 @@ services:
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
- "traefik.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.rule=Host(`hass.depaoli.id.au`) && PathPrefix(`/esphome/`)"
- "traefik.http.routers.esphome.tls=true" - "traefik.http.routers.esphome.tls=true"
- "traefik.http.routers.esphome.entrypoints=secureweb" - "traefik.http.routers.esphome.entrypoints=secureweb"
@@ -482,7 +471,6 @@ services:
- "traefik.http.routers.esphome.middlewares=stripprefix-esphome@docker" - "traefik.http.routers.esphome.middlewares=stripprefix-esphome@docker"
restart: always restart: always
privileged: true privileged: true
# network_mode: host
ports: ports:
- "6052:6052" - "6052:6052"
@@ -541,7 +529,6 @@ services:
- "traefik.http.routers.prometheus.entrypoints=web" - "traefik.http.routers.prometheus.entrypoints=web"
links: links:
- cadvisor:cadvisor - cadvisor:cadvisor
# - alertmanager:alertmanager
- node-exporter:node-exporter - node-exporter:node-exporter
- blackbox_exporter:blackbox_exporter - blackbox_exporter:blackbox_exporter
ports: ports:
@@ -568,20 +555,6 @@ services:
- "/var/lib/node_exporter/textfile_collector" - "/var/lib/node_exporter/textfile_collector"
restart: always 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: cadvisor:
image: gcr.io/cadvisor/cadvisor:latest image: gcr.io/cadvisor/cadvisor:latest
container_name: cadvisor container_name: cadvisor
@@ -603,8 +576,6 @@ services:
blackbox_exporter: blackbox_exporter:
image: prom/blackbox-exporter image: prom/blackbox-exporter
container_name: blackbox-exporter:latest container_name: blackbox-exporter:latest
# ports:
# - 9115:9115
command: command:
- '--config.file=/etc/blackboxexporter/config.yml' - '--config.file=/etc/blackboxexporter/config.yml'
labels: labels:
@@ -794,6 +765,8 @@ services:
tix: tix:
container_name: tix container_name: tix
restart: always restart: always
environment:
ENV: "production"
build: build:
context: '/home/ddp/src/snow-ticket-analysis' context: '/home/ddp/src/snow-ticket-analysis'
args: args:
@@ -801,7 +774,7 @@ services:
PJM_GID: 500 PJM_GID: 500
volumes: volumes:
- /srv/docker/container/letsencrypt/etc:/etc/letsencrypt - /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 - /etc/localtime:/etc/localtime:ro
labels: labels:
- "com.centurylinklabs.watchtower.enable=false" - "com.centurylinklabs.watchtower.enable=false"
@@ -992,16 +965,16 @@ services:
- /srv/docker/container/ark-server:/app - /srv/docker/container/ark-server:/app
- /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups - /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups
environment: environment:
- "SESSION_NAME=Aberration Server - ARK" - "SESSION_NAME=The Island - ARK"
- "SERVER_MAP=Aberration_P" - "SERVER_MAP=TheIsland"
- "SERVER_PASSWORD=ThisGameSucks" - "SERVER_PASSWORD=bagrid"
- "ADMIN_PASSWORD=arkadminpassword" - "ADMIN_PASSWORD=arkadminpassword"
- "MAX_PLAYERS=3" - "MAX_PLAYERS=5"
- "UPDATE_ON_START=false" - "UPDATE_ON_START=false"
- "BACKUP_ON_STOP=true" - "BACKUP_ON_STOP=true"
- "PRE_UPDATE_BACKUP=true" - "PRE_UPDATE_BACKUP=true"
- "WARN_ON_STOP=true" - "WARN_ON_STOP=true"
- "GAME_MOD_IDS=731604991,2182894352,821530042,1404697612,895711211" - "GAME_MOD_IDS=1404697612,1428596566,772235118,895711211"
ports: ports:
# Port for connections from ARK game client # Port for connections from ARK game client
- "7777:7777/udp" - "7777:7777/udp"
@@ -1013,41 +986,41 @@ services:
- "27015:27015/udp" - "27015:27015/udp"
# php wordpress (use traefik for https ssl offload) # php wordpress (use traefik for https ssl offload)
mimosa-clinic: # mimosa-clinic:
restart: always # restart: always
container_name: mimosa-clinic # container_name: mimosa-clinic
image: wordpress:latest # image: wordpress:latest
links: # links:
- mimosa-db:mysql # - mimosa-db:mysql
environment: # environment:
- WORDPRESS_DB_PASSWORD=badf)gaklsdjf77@(6234a # - WORDPRESS_DB_PASSWORD=badf)gaklsdjf77@(6234a
- WORDPRESS_DB_USER=root # - WORDPRESS_DB_USER=root
ports: # ports:
- "8787:80" # - "8787:80"
volumes: # volumes:
- /srv/docker/container/mimosa-clinic/www-data:/var/www/html # - /srv/docker/container/mimosa-clinic/www-data:/var/www/html
labels: # labels:
- "com.centurylinklabs.watchtower.enable=true" # - "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true" # - "traefik.enable=true"
- "traefik.http.routers.mimosa.entrypoints=secureweb" # - "traefik.http.routers.mimosa.entrypoints=secureweb"
- "traefik.http.routers.mimosa.rule=Host(`mimosa.depaoli.id.au`)" # - "traefik.http.routers.mimosa.rule=Host(`mimosa.depaoli.id.au`)"
- "traefik.http.routers.mimosa.tls=true" # - "traefik.http.routers.mimosa.tls=true"
- "traefik.http.routers.mimosa-http.entrypoints=web" # - "traefik.http.routers.mimosa-http.entrypoints=web"
- "traefik.http.routers.mimosa-http.rule=Host(`mimosa.depaoli.id.au`)" # - "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.scheme=https"
- "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.permanent=true" # - "traefik.http.middlewares.mimosa-http-redirect.redirectscheme.permanent=true"
- "traefik.http.routers.mimosa-http.middlewares=mimosa-http-redirect@docker" # - "traefik.http.routers.mimosa-http.middlewares=mimosa-http-redirect@docker"
mimosa-db: # mimosa-db:
restart: always # restart: always
container_name: mimosa-db # container_name: mimosa-db
image: mariadb:latest # image: mariadb:latest
environment: # environment:
- MYSQL_ROOT_PASSWORD=badf)gaklsdjf77@(6234a # - MYSQL_ROOT_PASSWORD=badf)gaklsdjf77@(6234a
- MYSQL_DATABASE=wordpress # - MYSQL_DATABASE=wordpress
labels: # labels:
- "com.centurylinklabs.watchtower.enable=true" # - "com.centurylinklabs.watchtower.enable=true"
volumes: # volumes:
- /srv/docker/container/mimosa-clinic/database:/var/lib/mysql # - /srv/docker/container/mimosa-clinic/database:/var/lib/mysql
kuma: kuma:
image: louislam/uptime-kuma:latest image: louislam/uptime-kuma:latest