Pi-Hole/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2025-12-20 02:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Default upstream DNS to Google and remove the mention of the environment variable from the quickstart compose file.

Browse Source 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2024-06-30 21:14:45 +01:00
parent c9a7c58dd3
commit a7565e2b23
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -47,9 +47,7 @@ services:
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g: # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
TZ: 'Europe/London' TZ: 'Europe/London'
# Set a password to access the web interface. Not setting one will result in a random password being assigned # Set a password to access the web interface. Not setting one will result in a random password being assigned
FTLCONF_webserver_api_password: 'correct horse battery staple' FTLCONF_webserver_api_password: 'correct horse battery staple'
# Configure DNS upstream servers, e.g:
FTLCONF_dns_upstreams: '8.8.8.8;8.8.4.4'
# Volumes store your data between container upgrades # Volumes store your data between container upgrades
volumes: volumes:
# For persisting Pi-hole's databases and common configuration file # For persisting Pi-hole's databases and common configuration file

4
examples/docker-compose-caddy-proxy.yml
View File

@@ -35,9 +35,7 @@ services:
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g: # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
TZ: 'Europe/London' TZ: 'Europe/London'
# Set a password to access the web interface. Not setting one will result in a random password being assigned # Set a password to access the web interface. Not setting one will result in a random password being assigned
FTLCONF_webserver_api_password: 'correct horse battery staple' FTLCONF_webserver_api_password: 'correct horse battery staple'
# Configure DNS upstream servers, e.g:
FTLCONF_dns_upstreams: '8.8.8.8;8.8.4.4'
# Volumes store your data between container upgrades # Volumes store your data between container upgrades
volumes: volumes:
# For persisting Pi-hole's databases and common configuration file # For persisting Pi-hole's databases and common configuration file

9
src/bash_functions.sh
View File

@@ -62,12 +62,9 @@ ensure_basic_configuration() {
fi fi
# If getFTLConfigValue "dns.upstreams" returns [], exit the container. We need upstream servers to function! # If getFTLConfigValue "dns.upstreams" returns [], exit the container. We need upstream servers to function!
if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then
echo "" echo " [i] No DNS upstream set in environment or config file, defaulting to Google DNS"
echo " [X] No DNS upstream servers are set!" setFTLConfigValue "dns.upstreams" "[\"8.8.8.8\", \"8.8.4.4\"]"
echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstreams"
echo ""
exit 1
fi fi
setup_web_password setup_web_password