Updated docker-compose files
This commit is contained in:
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
/pihole/etc-pihole
|
||||||
24
pihole/docker-compose.yml
Normal file
24
pihole/docker-compose.yml
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
|
||||||
|
services:
|
||||||
|
pihole:
|
||||||
|
container_name: pihole
|
||||||
|
hostname: Pihole
|
||||||
|
image: pihole/pihole:latest
|
||||||
|
network_mode: vlanPihole
|
||||||
|
environment:
|
||||||
|
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
|
||||||
|
TZ: 'Europe/Berlin'
|
||||||
|
# Set a password to access the web interface. Not setting one will result in a random password being assigned
|
||||||
|
FTLCONF_webserver_api_password: 'inginf95'
|
||||||
|
WEB_PORT: '9090'
|
||||||
|
# Volumes store your data between container upgrades
|
||||||
|
volumes:
|
||||||
|
# For persisting Pi-hole's databases and common configuration file
|
||||||
|
- './etc-pihole:/etc/pihole'
|
||||||
|
# Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
|
||||||
|
#- './etc-dnsmasq.d:/etc/dnsmasq.d'
|
||||||
|
#cap_add:
|
||||||
|
# See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
|
||||||
|
# Required if you are using Pi-hole as your DHCP server, else not needed
|
||||||
|
#- NET_ADMIN
|
||||||
|
restart: unless-stopped
|
||||||
37
pihole/docker-compose.yml_bak
Normal file
37
pihole/docker-compose.yml_bak
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
|
||||||
|
services:
|
||||||
|
pihole:
|
||||||
|
container_name: pihole
|
||||||
|
image: pihole/pihole:latest
|
||||||
|
ports:
|
||||||
|
# DNS Ports
|
||||||
|
- "53:53/tcp"
|
||||||
|
- "53:53/udp"
|
||||||
|
# Default HTTP Port
|
||||||
|
- "9090:80/tcp"
|
||||||
|
# Default HTTPs Port. FTL will generate a self-signed certificate
|
||||||
|
#- "9043:443/tcp"
|
||||||
|
# Uncomment the below if using Pi-hole as your DHCP Server
|
||||||
|
#- "67:67/udp"
|
||||||
|
networks:
|
||||||
|
- pihole_network
|
||||||
|
environment:
|
||||||
|
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
|
||||||
|
TZ: 'Europe/Berlin'
|
||||||
|
# Set a password to access the web interface. Not setting one will result in a random password being assigned
|
||||||
|
FTLCONF_webserver_api_password: 'inginf95'
|
||||||
|
# Volumes store your data between container upgrades
|
||||||
|
volumes:
|
||||||
|
# For persisting Pi-hole's databases and common configuration file
|
||||||
|
- './etc-pihole:/etc/pihole'
|
||||||
|
# Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
|
||||||
|
#- './etc-dnsmasq.d:/etc/dnsmasq.d'
|
||||||
|
#cap_add:
|
||||||
|
# See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
|
||||||
|
# Required if you are using Pi-hole as your DHCP server, else not needed
|
||||||
|
#- NET_ADMIN
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
networks:
|
||||||
|
pihole_network:
|
||||||
|
driver: bridge
|
||||||
@@ -14,6 +14,8 @@ services:
|
|||||||
- /media/plex/tv-shows:/tv-shows
|
- /media/plex/tv-shows:/tv-shows
|
||||||
- /media/plex/movies:/movies
|
- /media/plex/movies:/movies
|
||||||
- /media/plex/music:/music
|
- /media/plex/music:/music
|
||||||
|
- /media/plex/cartoons:/cartoons
|
||||||
|
- /media/plex/comedy:/comedy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
# Plex DLNA Server
|
# Plex DLNA Server
|
||||||
@@ -29,13 +31,8 @@ services:
|
|||||||
- "traefik.http.routers.plex.service=plex"
|
- "traefik.http.routers.plex.service=plex"
|
||||||
- "traefik.http.services.plex.loadbalancer.server.port=32400"
|
- "traefik.http.services.plex.loadbalancer.server.port=32400"
|
||||||
- "traefik.docker.network=proxy"
|
- "traefik.docker.network=proxy"
|
||||||
networks:
|
network_mode: host
|
||||||
- traefik_web
|
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
plex_config:
|
plex_config:
|
||||||
|
|
||||||
networks:
|
|
||||||
traefik_web:
|
|
||||||
external: true
|
|
||||||
Reference in New Issue
Block a user