Convert rest of docker-compose files to TOML
This commit is contained in:
parent
8aaa911e19
commit
d793734621
26 changed files with 479 additions and 529 deletions
34
docker/pihole/docker-compose.toml
Normal file
34
docker/pihole/docker-compose.toml
Normal file
|
@ -0,0 +1,34 @@
|
|||
[services]
|
||||
|
||||
[services.pihole]
|
||||
container_name = "pihole"
|
||||
image = "pihole/pihole:latest"
|
||||
ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"]
|
||||
networks = ["proxy"]
|
||||
volumes = [
|
||||
"/docker/pihole/pihole:/etc/pihole/",
|
||||
"/docker/pihole/dnsmasq:/etc/dnsmasq.d/",
|
||||
]
|
||||
dns = ["127.0.0.1", "1.1.1.1"]
|
||||
cap_add = ["NET_ADMIN"]
|
||||
restart = "unless-stopped"
|
||||
labels = [
|
||||
"traefik.enable=true",
|
||||
"traefik.http.routers.pihole-redirect.entrypoints=http",
|
||||
"traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)",
|
||||
"traefik.http.routers.pihole-redirect.middlewares=http2https@file",
|
||||
"traefik.http.routers.pihole.entrypoints=https",
|
||||
"traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)",
|
||||
"traefik.http.routers.pihole.service=pihole",
|
||||
"traefik.docker.network=proxy",
|
||||
"traefik.http.services.pihole.loadbalancer.server.port=80",
|
||||
]
|
||||
|
||||
[services.pihole.environment]
|
||||
TZ = "Europe/Helsinki"
|
||||
WEBPASSWORD = "${WEBPASSWORD}"
|
||||
|
||||
[networks]
|
||||
|
||||
[networks.proxy]
|
||||
external = true
|
|
@ -1,41 +0,0 @@
|
|||
services:
|
||||
pihole:
|
||||
container_name: pihole
|
||||
image: pihole/pihole:latest
|
||||
ports:
|
||||
- "53:53/tcp"
|
||||
- "53:53/udp"
|
||||
- "67:67/udp"
|
||||
- "8069:80/tcp"
|
||||
networks:
|
||||
- proxy
|
||||
environment:
|
||||
TZ: "Europe/Helsinki"
|
||||
WEBPASSWORD: "${WEBPASSWORD}"
|
||||
volumes:
|
||||
- "/docker/pihole/pihole:/etc/pihole/"
|
||||
- "/docker/pihole/dnsmasq:/etc/dnsmasq.d/"
|
||||
dns:
|
||||
- 127.0.0.1
|
||||
- 1.1.1.1
|
||||
# Recommended but not required (DHCP needs NET_ADMIN)
|
||||
# https://github.com/pihole/docker-pihole#note-on-capabilities
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
restart: unless-stopped
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
|
||||
- "traefik.http.routers.pihole-redirect.entrypoints=http"
|
||||
- "traefik.http.routers.pihole-redirect.rule=Host(`pihole.korhonen.cc`)"
|
||||
- "traefik.http.routers.pihole-redirect.middlewares=http2https@file"
|
||||
|
||||
- "traefik.http.routers.pihole.entrypoints=https"
|
||||
- "traefik.http.routers.pihole.rule=Host(`pihole.korhonen.cc`)"
|
||||
- "traefik.http.routers.pihole.service=pihole"
|
||||
- "traefik.docker.network=proxy"
|
||||
- "traefik.http.services.pihole.loadbalancer.server.port=80"
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
Loading…
Add table
Add a link
Reference in a new issue