ddp/docker-compose
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed pihole to handle /admin redirect, updated blackbox-exporter to have proper :latest on the image not the container name, moved to newer speedtest with latest tag, updated pihole to use newer DNS settings for newer pihole syntax/version

Browse Source
This commit is contained in:
Damien De Paoli
2023-08-30 22:35:21 +10:00
parent 1cfcac194e
commit a502982f1c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docker-compose.yml
View File

@@ -498,7 +498,7 @@ services:
# Monitoring # Monitoring
speedtest-exporter: speedtest-exporter:
image: jraviles/prometheus_speedtest:latest image: miguelndecarvalho/speedtest-exporter:latest
container_name: speedtest-exporter container_name: speedtest-exporter
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
@@ -575,8 +575,8 @@ services:
restart: always restart: always
blackbox_exporter: blackbox_exporter:
image: prom/blackbox-exporter image: prom/blackbox-exporter:latest
container_name: blackbox-exporter:latest container_name: blackbox-exporter
command: command:
- '--config.file=/etc/blackboxexporter/config.yml' - '--config.file=/etc/blackboxexporter/config.yml'
labels: labels:
@@ -618,8 +618,7 @@ services:
environment: environment:
TZ: 'Australia/Melbourne' TZ: 'Australia/Melbourne'
WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c' WEBPASSWORD: 'O701JH&%fDqIw836eTiw1LxzlGw!sn%c'
DNS1: '192.168.0.2' PIHOLE_DNS_: '208.67.222.222;208.67.220.220'
DNS2: '208.67.222.222'
volumes: volumes:
- /srv/docker/container/pihole/etc/:/etc/pihole/ - /srv/docker/container/pihole/etc/:/etc/pihole/
- /srv/docker/container/pihole/dnsmasq.d/:/etc/dnsmasq.d/ - /srv/docker/container/pihole/dnsmasq.d/:/etc/dnsmasq.d/
@@ -628,11 +627,13 @@ services:
labels: labels:
- "com.centurylinklabs.watchtower.enable=true" - "com.centurylinklabs.watchtower.enable=true"
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.pihole.rule=PathPrefix(`/pihole/`)" - "traefik.http.routers.pihole.rule=PathPrefix(`/pihole/`) || PathPrefix(`/admin/`)"
- "traefik.http.routers.pihole.entrypoints=web" - "traefik.http.routers.pihole.entrypoints=web"
- "traefik.http.middlewares.replaceprefix-pihole.replacepathregex.regex=^/admin/$$"
- "traefik.http.middlewares.replaceprefix-pihole.replacepathregex.replacement=/pihole/admin/"
- "traefik.http.middlewares.stripprefix-pihole.stripprefix.prefixes=/pihole" - "traefik.http.middlewares.stripprefix-pihole.stripprefix.prefixes=/pihole"
- "traefik.http.services.pihole.loadbalancer.server.port=80" - "traefik.http.services.pihole.loadbalancer.server.port=80"
- "traefik.http.routers.pihole.middlewares=stripprefix-pihole@docker" - "traefik.http.routers.pihole.middlewares=replaceprefix-pihole@docker,stripprefix-pihole@docker"
bookdb_dev: bookdb_dev:
container_name: bookdb_dev container_name: bookdb_dev