consistent use of restart:always to fix some containers not starting on boot in U22.04, also had to stop doing ports and network_mode (TO FIX), added in new bookdb_dev to make book* be consistent with PA added dependencies to try to better order container startups, switched to different source of cadvisor - it works, but still logs verbose errors about mem (TO FIX)

This commit is contained in:
2022-06-19 00:00:46 +10:00
parent d74ec9000e
commit 176675e7d1

View File

@@ -3,7 +3,7 @@ services:
traefik:
container_name: traefik
image: "traefik"
restart: unless-stopped
restart: always
network_mode: host
command:
# - "--log.level=DEBUG"
@@ -28,9 +28,11 @@ services:
- "traefik.http.routers.dashboard.entrypoints=web"
- "traefik.http.services.dashboard.loadbalancer.server.port=8080"
- "traefik.http.routers.dashboard.service=api@internal"
ports:
- "80:80"
- "443:443"
# ports:
# - "80:80"
# - "443:443"
depends_on:
- sonarr
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /srv/docker/container/traefik/:/configuration
@@ -40,7 +42,7 @@ services:
sonarr:
container_name: sonarr
image: linuxserver/sonarr
restart: unless-stopped
restart: always
environment:
- TZ=Australia/Melbourne
- PUID=500
@@ -51,6 +53,8 @@ services:
- "traefik.http.routers.sonarr.rule=Host(`son.depaoli.id.au`)"
- "traefik.http.routers.sonarr.tls=true"
- "traefik.http.routers.sonarr.entrypoints=secureweb"
depends_on:
- pihole
volumes:
- /srv/docker/container/sonarr/config:/config
- /export/docker/storage/downloads:/downloads
@@ -60,7 +64,7 @@ services:
lidarr:
container_name: lidarr
image: linuxserver/lidarr
restart: unless-stopped
restart: always
environment:
- TZ=Australia/Melbourne
- PUID=500
@@ -72,6 +76,8 @@ services:
- "traefik.http.routers.lidarr.entrypoints=web"
ports:
- "8686:8686"
depends_on:
- pihole
volumes:
- /srv/docker/container/lidarr/config:/config
- /export/docker/storage/downloads:/downloads
@@ -81,7 +87,7 @@ services:
radarr:
container_name: radarr
image: linuxserver/radarr
restart: unless-stopped
restart: always
environment:
- TZ=Australia/Melbourne
- PUID=500
@@ -92,6 +98,8 @@ services:
- "traefik.http.routers.radarr.rule=Host(`rad.depaoli.id.au`)"
- "traefik.http.routers.radarr.tls=true"
- "traefik.http.routers.radarr.entrypoints=secureweb"
depends_on:
- pihole
volumes:
- /srv/docker/container/radarr/config:/config
- /export/docker/storage/downloads:/downloads
@@ -101,7 +109,7 @@ services:
readarr:
container_name: readarr
image: linuxserver/readarr:nightly
restart: unless-stopped
restart: always
environment:
- TZ=Australia/Melbourne
- PUID=500
@@ -111,6 +119,8 @@ services:
- "traefik.enable=true"
- "traefik.http.routers.readarr.rule=PathPrefix(`/readarr/`)"
- "traefik.http.routers.readarr.entrypoints=web"
depends_on:
- pihole
volumes:
- /srv/docker/container/readarr/config:/config
- /export/docker/storage/downloads:/downloads
@@ -120,7 +130,7 @@ services:
calibre:
container_name: calibre
image: linuxserver/calibre
restart: unless-stopped
restart: always
environment:
- TZ=Australia/Melbourne
- PUID=500
@@ -139,6 +149,8 @@ services:
# - "traefik.http.services.calibreweb.loadbalancer.server.port=8081"
# - "traefik.http.middlewares.stripprefix-calibreweb.stripprefix.prefixes=/calibreweb"
# - "traefik.http.routers.calibreweb.entrypoints=web"
depends_on:
- pihole
volumes:
- /srv/docker/container/calibre/config:/config
- /etc/localtime:/etc/localtime:ro
@@ -146,7 +158,7 @@ services:
emby:
container_name: emby
image: emby/embyserver
restart: unless-stopped
restart: always
network_mode: host
environment:
- UID=500
@@ -160,11 +172,13 @@ services:
- /export/docker/storage:/data
- /export/myth/tv:/myth-recordings
- /etc/localtime:/etc/localtime:ro
ports:
- "8096:8096"
- "8920:8920"
- "7359:7359/udp"
- "1900:1900/udp"
# ports:
# - "8096:8096"
# - "8920:8920"
# - "7359:7359/udp"
# - "1900:1900/udp"
depends_on:
- pihole
labels:
- "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true"
@@ -193,6 +207,7 @@ services:
hostname: mail
domainname: depaoli.id.au
container_name: mail
restart: always
ports:
- "25:25"
- "465:465"
@@ -200,6 +215,9 @@ services:
- "993:993"
labels:
- "com.centurylinklabs.watchtower.enable=true"
depends_on:
- pihole
- openldap
volumes:
- /srv/docker/container/mail/data:/var/mail
- /srv/docker/container/mail/state:/var/mail-state
@@ -249,6 +267,7 @@ services:
image: osixia/openldap:latest
container_name: openldap
# command: "--loglevel debug"
restart: always
labels:
- "com.centurylinklabs.watchtower.enable=true"
environment:
@@ -277,6 +296,8 @@ services:
LDAP_SSL_HELPER_PREFIX: "ldap"
tty: true
stdin_open: true
depends_on:
- pihole
volumes:
- /srv/docker/container/ldap/var/lib/ldap:/var/lib/ldap
- /srv/docker/container/ldap/etc/ldap/slapd.d:/etc/ldap/slapd.d
@@ -290,6 +311,7 @@ services:
phpldapadmin:
image: osixia/phpldapadmin:latest
container_name: phpldapadmin
restart: always
environment:
PHPLDAPADMIN_LDAP_HOSTS: "openldap"
PHPLDAPADMIN_HTTPS: "false"
@@ -300,18 +322,19 @@ services:
- "traefik.http.middlewares.stripprefix-phpldapadmin.stripprefix.prefixes=/phpldapadmin"
- "traefik.http.routers.phpldapadmin.middlewares=stripprefix-phpldapadmin@docker"
- "traefik.http.routers.phpldapadmin.entrypoints=web"
depends_on:
- pihole
- openldap
volumes:
- /srv/docker/container/phpldapadmin/var/www/phpldapadmin:/var/www/phpldapadmin
- /etc/localtime:/etc/localtime:ro
depends_on:
- openldap
# webmail
roundcubemail:
image: roundcube/roundcubemail:latest
container_name: roundcubemail
restart: unless-stopped
restart: always
labels:
- "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true"
@@ -324,6 +347,10 @@ services:
- /srv/docker/container/roundcubemail/tmp/roundcube-temp:/tmp/roundcube-temp
- /srv/docker/container/roundcubemail/var/roundcube/config:/var/roundcube/config
- /etc/localtime:/etc/localtime:ro
depends_on:
- pihole
- mail
- openldap
environment:
- ROUNDCUBEMAIL_DB_TYPE=sqlite
- ROUNDCUBEMAIL_SKIN=elastic
@@ -335,7 +362,9 @@ services:
portainer:
container_name: portainer
image: portainer/portainer-ce:latest
restart: unless-stopped
restart: always
depends_on:
- pihole
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /srv/docker/container/portainer/data:/data
@@ -352,7 +381,7 @@ services:
plex:
container_name: plex
image: plexinc/pms-docker
restart: unless-stopped
restart: always
environment:
- TZ=Australia/Melbourne
- PLEX_CLAIM=claim-Mgs3KDD_zM-rheXvz6FJ
@@ -361,6 +390,8 @@ services:
hostname: plex_dp
labels:
- "com.centurylinklabs.watchtower.enable=true"
depends_on:
- pihole
volumes:
- /myth/opt/plex/config:/config
- /myth/opt/plex/transcode:/transcode
@@ -376,6 +407,9 @@ services:
restart: always
security_opt:
- seccomp:unconfined
depends_on:
- pihole
- openldap
volumes:
- /srv/docker/container/hass:/config
- /var/run/docker.sock:/var/run/docker.sock
@@ -393,11 +427,13 @@ services:
sabnzbd:
image: linuxserver/sabnzbd
container_name: sabnzbd
restart: unless-stopped
restart: always
environment:
- PUID=500
- PGID=500
- TZ=Australia/Melbourne
depends_on:
- pihole
volumes:
- /srv/docker/container/sabnzbd/:/config
- /export/docker/storage/downloads:/downloads
@@ -415,13 +451,17 @@ services:
container_name: speedtest-exporter
labels:
- "com.centurylinklabs.watchtower.enable=true"
depends_on:
- pihole
volumes:
- /etc/localtime:/etc/localtime:ro
restart: unless-stopped
restart: always
prometheus:
image: prom/prometheus:latest
container_name: prometheus
depends_on:
- pihole
volumes:
- /srv/docker/container/prometheus/:/etc/prometheus/
- /srv/docker/container/prometheus/data:/prometheus
@@ -441,6 +481,7 @@ services:
- cadvisor:cadvisor
- alertmanager:alertmanager
- node-exporter:node-exporter
- blackbox_exporter:blackbox_exporter
ports:
- 9090:9090
restart: always
@@ -480,7 +521,8 @@ services:
- '--storage.path=/alertmanager'
cadvisor:
image: google/cadvisor:latest
# image: google/cadvisor:latest
image: gcr.io/cadvisor/cadvisor:latest
container_name: cadvisor
privileged: true
command:
@@ -512,6 +554,7 @@ services:
grafana:
image: grafana/grafana:latest
container_name: grafana
restart: always
depends_on:
- prometheus
volumes:
@@ -544,7 +587,7 @@ services:
- /srv/docker/container/pihole/etc/:/etc/pihole/
- /srv/docker/container/pihole/dnsmasq.d/:/etc/dnsmasq.d/
- /etc/localtime:/etc/localtime:ro
restart: unless-stopped
restart: always
labels:
- "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true"
@@ -554,15 +597,35 @@ services:
- "traefik.http.services.pihole.loadbalancer.server.port=80"
- "traefik.http.routers.pihole.middlewares=stripprefix-pihole@docker"
bookdb:
container_name: bookdb
image: postgres
bookdb_dev:
container_name: bookdb_dev
image: postgres:13
restart: always
environment:
POSTGRES_PASSWORD: blahdeblah
POSTGRES_USER: ddp
POSTGRES_DB: library
PGPASSWORD: NWNlfa01
depends_on:
- pihole
ports:
- '55432:5432'
volumes:
- /srv/docker/container/bookdb_dev/data:/var/lib/postgresql/data
- /srv/docker/container/bookdb_dev/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
- /etc/localtime:/etc/localtime:ro
bookdb:
container_name: bookdb
image: postgres:13
restart: always
environment:
POSTGRES_PASSWORD: blahdeblah
POSTGRES_USER: ddp
POSTGRES_DB: library
PGPASSWORD: NWNlfa01
depends_on:
- pihole
volumes:
- /srv/docker/container/bookdb/data:/var/lib/postgresql/data
- /srv/docker/container/bookdb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
@@ -570,10 +633,14 @@ services:
bookdb_web:
container_name: bookdb_web
restart: always
build: '/home/ddp/src/pybook'
depends_on:
- bookdb
- pihole
volumes:
- /srv/docker/container/letsencrypt/etc:/etc/letsencrypt
- /etc/localtime:/etc/localtime:ro
- /srv/docker/container/letsencrypt/etc:/etc/letsencrypt
- /etc/localtime:/etc/localtime:ro
labels:
- "com.centurylinklabs.watchtower.enable=false"
- "traefik.enable=true"
@@ -583,7 +650,7 @@ services:
padb_dev:
container_name: padb_dev
image: postgres
image: postgres:13
restart: always
environment:
POSTGRES_PASSWORD: for_now_pa
@@ -592,6 +659,8 @@ services:
PGPASSWORD: for_now_overall_pg_pass
ports:
- '65432:5432'
depends_on:
- pihole
volumes:
- /srv/docker/container/padb_dev/data:/var/lib/postgresql/data
- /srv/docker/container/padb_dev/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
@@ -599,13 +668,15 @@ services:
padb:
container_name: padb
image: postgres
image: postgres:13
restart: always
environment:
POSTGRES_PASSWORD: for_now_pa
POSTGRES_USER: pa
POSTGRES_DB: pa
PGPASSWORD: for_now_overall_pg_pass
depends_on:
- pihole
volumes:
- /srv/docker/container/padb/data:/var/lib/postgresql/data
- /srv/docker/container/padb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
@@ -613,11 +684,14 @@ services:
paweb:
container_name: paweb
restart: always
build:
context: '/home/ddp/src/photoassistant'
args:
PJM_UID: 500
PJM_GID: 500
depends_on:
- padb
volumes:
- /srv/docker/container/letsencrypt/etc:/etc/letsencrypt
- /export/docker/storage:/export/docker/storage
@@ -631,7 +705,11 @@ services:
bitwarden_rs:
container_name: bitwarden
restart: always
image: bitwardenrs/server:latest
depends_on:
- pihole
- openldap
volumes:
- /srv/docker/container/bitwarden_rs/data:/data
- /etc/localtime:/etc/localtime:ro
@@ -648,6 +726,8 @@ services:
image: containrrr/watchtower
command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup
restart: always
depends_on:
- pihole
labels:
- "com.centurylinklabs.watchtower.enable=true"
volumes:
@@ -663,7 +743,10 @@ services:
POSTGRES_USER: wikijs
logging:
driver: "none"
restart: unless-stopped
restart: always
depends_on:
- openldap
- pihole
volumes:
- "/srv/docker/container/wikidb/:/var/lib/postgresql/data"
- "/etc/localtime:/etc/localtime:ro"
@@ -672,6 +755,7 @@ services:
image: requarks/wiki:2
container_name: wiki
depends_on:
- openldap
- wikidb
environment:
DB_TYPE: postgres
@@ -680,7 +764,7 @@ services:
DB_USER: wikijs
DB_PASS: testthisthing
DB_NAME: wiki
restart: unless-stopped
restart: always
volumes:
- "/srv/docker/container/wiki/data/content:/wiki/data/content"
- "/etc/localtime:/etc/localtime:ro"
@@ -694,6 +778,7 @@ services:
wetty:
image: wettyoss/wetty
container_name: wetty
restart: always
command:
- --base=/
- --ssh-host=192.168.0.2
@@ -703,6 +788,9 @@ services:
- "traefik.http.routers.wetty.rule=Host(`ssh.depaoli.id.au`)"
- "traefik.http.routers.wetty.tls=true"
- "traefik.http.routers.wetty.entrypoints=secureweb"
depends_on:
- pihole
- openldap
volumes:
- "/etc/localtime:/etc/localtime:ro"
@@ -710,6 +798,7 @@ services:
eufy_security_ws:
image: bropat/eufy-security-ws:latest
container_name: eufy_security_ws
restart: always
environment:
- "USERNAME=eufy_hass@depaoli.id.au"
- "PASSWORD=JUkoCuA!wH*f9Jeg^w*d"
@@ -719,6 +808,8 @@ services:
- "3000:3000"
labels:
- "com.centurylinklabs.watchtower.enable=true"
depends_on:
- pihole
volumes:
- "/srv/docker/container/eufy_security_ws/data:/data"
- "/etc/localtime:/etc/localtime:ro"
@@ -728,6 +819,7 @@ services:
rtsp_simple_server:
image: aler9/rtsp-simple-server
container_name: rtsp_simple_server
restart: always
environment:
- "RTSP_PROTOCOLS=tcp"
ports:
@@ -735,5 +827,7 @@ services:
- "8554:8554"
labels:
- "com.centurylinklabs.watchtower.enable=true"
depends_on:
- pihole
volumes:
- "/etc/localtime:/etc/localtime:ro"