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

Signed-off-by: Adam Warner <[email protected]>

Author: PromoFaux

README.md

@@ -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:
       TZ: 'Europe/London'
       # 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'
-      # Configure DNS upstream servers, e.g:
-      FTLCONF_dns_upstreams: '8.8.8.8;8.8.4.4'
+      FTLCONF_webserver_api_password: 'correct horse battery staple'     
     # Volumes store your data between container upgrades
     volumes:
       # For persisting Pi-hole's databases and common configuration file

examples/docker-compose-caddy-proxy.yml

@@ -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:
       TZ: 'Europe/London'
       # 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'
-      # Configure DNS upstream servers, e.g:
-      FTLCONF_dns_upstreams: '8.8.8.8;8.8.4.4'
+      FTLCONF_webserver_api_password: 'correct horse battery staple'     
     # Volumes store your data between container upgrades
     volumes:
       # For persisting Pi-hole's databases and common configuration file

src/bash_functions.sh

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