From e831eb8b67e2064a5c7ba3c9fe4811a676ac802e Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Wed, 8 Jan 2025 17:09:25 +1100 Subject: [PATCH] remove pihole, final replacement with adguard as the dependency in docker as well --- docker-compose.yml | 81 +++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 55 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 069a1c3..2598321 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: - "traefik.http.routers.dashboard.service=api@internal" - "last.commit.url=https://api.github.com/repos/traefik/traefik/commits" depends_on: - - pihole + - adguard volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - /srv/docker/container/traefik/:/configuration @@ -80,7 +80,7 @@ services: - "traefik.http.routers.sonarr.tls.certresolver=myresolver" - "last.commit.url=https://api.github.com/repos/linuxserver/docker-sonarr/commits" depends_on: - - pihole + - adguard volumes: - /srv/docker/container/sonarr/config:/config - /export/docker/storage/downloads:/downloads @@ -104,7 +104,7 @@ services: - "traefik.http.routers.radarr.tls.certresolver=myresolver" - "last.commit.url=https://api.github.com/repos/linuxserver/docker-radarr/commits" depends_on: - - pihole + - adguard volumes: - /srv/docker/container/radarr/config:/config - /export/docker/storage/downloads:/downloads @@ -126,7 +126,7 @@ services: - "traefik.http.routers.readarr.entrypoints=web" - "last.commit.url=https://api.github.com/repos/Readarr/Readarr/commits" depends_on: - - pihole + - adguard volumes: - /srv/docker/container/readarr/config:/config - /export/docker/storage/downloads:/downloads @@ -154,7 +154,7 @@ services: - "traefik.http.routers.calibreweb.entrypoints=web" - "last.commit.url=https://api.github.com/repos/linuxserver/docker-calibre/commits" depends_on: - - pihole + - adguard volumes: - /srv/docker/container/calibre/config:/config - /etc/localtime:/etc/localtime:ro @@ -164,7 +164,7 @@ services: emby: container_name: emby # image: emby/embyserver:latest - image: emby/embyserver:4.9.0.34 + image: emby/embyserver:4.9.0.35 restart: always network_mode: host environment: @@ -182,7 +182,7 @@ services: devices: - /dev/dri:/dev/dri depends_on: - - pihole + - adguard labels: - "com.centurylinklabs.watchtower.enable=true" - "traefik.enable=true" @@ -214,7 +214,7 @@ services: - "traefik.http.routers.mail.entrypoints=web" - "last.commit.url=https://api.github.com/repos/docker-mailserver/docker-mailserver/commits" depends_on: - - pihole + - adguard - openldap volumes: - /srv/docker/container/mail/data:/var/mail @@ -301,7 +301,7 @@ services: tty: true stdin_open: true depends_on: - - pihole + - adguard volumes: - /srv/docker/container/ldap/:/bitnami/openldap/ - /srv/docker/container/ldap/bootstrap-schema:/schemas @@ -330,7 +330,7 @@ services: - /srv/docker/container/roundcubemail/var/roundcube/config:/var/roundcube/config - /etc/localtime:/etc/localtime:ro depends_on: - - pihole + - adguard - mail - openldap environment: @@ -346,7 +346,7 @@ services: image: portainer/portainer-ce:latest restart: always depends_on: - - pihole + - adguard volumes: - /var/run/docker.sock:/var/run/docker.sock - /srv/docker/container/portainer/data:/data @@ -370,7 +370,7 @@ services: security_opt: - seccomp:unconfined depends_on: - - pihole + - adguard - openldap volumes: - /srv/docker/container/hass:/config @@ -399,7 +399,7 @@ services: # restart: always # network_mode: host # depends_on: -# - pihole +# - adguard # - emby # volumes: # - /srv/docker/container/mass/data:/data @@ -459,7 +459,7 @@ services: - PGID=500 - TZ=Australia/Melbourne depends_on: - - pihole + - adguard volumes: - /srv/docker/container/sabnzbd/:/config - /export/docker/storage/downloads:/downloads @@ -580,35 +580,6 @@ services: - "traefik.http.services.adguard.loadbalancer.server.port=80" - "last.commit.url=https://api.github.com/repos/AdguardTeam/AdGuardHome/commits" - pihole: - container_name: pihole - image: pihole/pihole:latest -# ports: -# - "192.168.0.2:53:53/tcp" -# - "192.168.0.2:53:53/udp" - environment: - TZ: 'Australia/Melbourne' - PIHOLE_DNS_: '208.67.222.222;208.67.220.220' - env_file: - - /srv/docker/config/secrets/pihole - volumes: - - /srv/docker/container/pihole/etc/:/etc/pihole/ - - /srv/docker/container/pihole/dnsmasq.d/:/etc/dnsmasq.d/ - - /etc/localtime:/etc/localtime:ro - restart: always - labels: - - "com.centurylinklabs.watchtower.enable=true" - - "traefik.enable=true" - - "traefik.http.routers.pihole.entrypoints=web" - - "traefik.http.routers.pihole.rule=Host(`pihole.ddp.net`)" - # pihole is a mess, it does not redirect, but requires /admin to login, then it does redirect back to / -- the strip & add fixes this mess - - "traefik.http.middlewares.pihole-add.addprefix.prefix=/admin" - - "traefik.http.middlewares.pihole-strip.stripprefix.prefixes=/admin" - - "traefik.http.routers.pihole.middlewares=pihole-strip,pihole-add" - # we set this to port 80, pihole has many open ports (e.g. 53), so have to tell traefik which port to send http traffic too - - "traefik.http.services.pihole.loadbalancer.server.port=80" - - "last.commit.url=https://api.github.com/repos/pi-hole/pi-hole/commits" - bookdb_dev: container_name: bookdb_dev image: postgres:latest @@ -619,7 +590,7 @@ services: env_file: - /srv/docker/config/secrets/bookdb-common depends_on: - - pihole + - adguard labels: - "com.centurylinklabs.watchtower.enable=true" - "last.commit.url=https://api.github.com/repos/postgres/postgres/commits" @@ -638,7 +609,7 @@ services: env_file: - /srv/docker/config/secrets/bookdb-common depends_on: - - pihole + - adguard labels: - "com.centurylinklabs.watchtower.enable=true" - "last.commit.url=https://api.github.com/repos/postgres/postgres/commits" @@ -660,7 +631,7 @@ services: BOOK_GID: "1000" depends_on: - bookdb_dev - - pihole + - adguard volumes: - /home/ddp/src/pybook/:/pybook_mapped_volume - /export/docker/storage/books/:/books @@ -684,7 +655,7 @@ services: BOOK_GID: "1000" depends_on: - bookdb - - pihole + - adguard volumes: - /export/docker/storage/books:/books - /etc/localtime:/etc/localtime:ro @@ -711,7 +682,7 @@ services: env_file: - /srv/docker/config/secrets/padb-common depends_on: - - pihole + - adguard volumes: - /srv/docker/container/padb_dev/data:/var/lib/postgresql/data - /srv/docker/container/padb_dev/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d @@ -739,7 +710,7 @@ services: env_file: - /srv/docker/config/secrets/padb-common depends_on: - - pihole + - adguard volumes: - /srv/docker/container/padb/data:/var/lib/postgresql/data - /srv/docker/container/padb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d @@ -839,7 +810,7 @@ services: restart: always image: vaultwarden/server:latest depends_on: - - pihole + - adguard - openldap volumes: - /srv/docker/container/vaultwarden:/data @@ -865,7 +836,7 @@ services: command: --schedule "0 0 3 * * *" --debug --stop-timeout 60s --label-enable --cleanup restart: always depends_on: - - pihole + - adguard labels: - "com.centurylinklabs.watchtower.enable=true" - "last.commit.url=https://api.github.com/repos/containrrr/watchtower/commits" @@ -891,7 +862,7 @@ services: - "com.centurylinklabs.watchtower.enable=true" - "last.commit.url=https://api.github.com/repos/bropat/eufy-security-ws/commits" depends_on: - - pihole + - adguard volumes: - "/srv/docker/container/eufy_security_ws/data:/data" - "/etc/localtime:/etc/localtime:ro" @@ -911,7 +882,7 @@ services: - "com.centurylinklabs.watchtower.enable=true" - "last.commit.url=https://api.github.com/repos/bluenviron/mediamtx/commits" depends_on: - - pihole + - adguard volumes: - "/etc/localtime:/etc/localtime:ro" @@ -1148,7 +1119,7 @@ services: - /srv/docker/container/samba/mara-init:/root/mara-init - /srv/docker/container/samba/mara-bin:/root/mara-bin depends_on: - - pihole + - adguard - openldap labels: - "com.centurylinklabs.watchtower.enable=true" @@ -1173,7 +1144,7 @@ services: - /srv/docker/container/ftp/mara-init:/root/mara-init - /srv/docker/container/ftp/mara-bin:/root/mara-bin depends_on: - - pihole + - adguard - openldap labels: - "com.centurylinklabs.watchtower.enable=true"