docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #758 from pi-hole/dev 

Latest versions to master
This commit is contained in:
Adam Hill 2021-01-16 09:13:07 -06:00 committed by GitHub
parent 5c21f146f4 b154947cb9
commit 9bcd8e163a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v5.2.2
v5.2.3

2
install.sh
View File

@ -7,7 +7,7 @@ export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
export WEB_VERSION="${CORE_VERSION}"
export PIHOLE_SKIP_OS_CHECK=true
# Overwrite WEB_VERSION if core and web versions are different
#export WEB_VERSION="v5.1.1"
export WEB_VERSION="v5.3"
# Only use for pre-production / testing
export CHECKOUT_BRANCHES=false

22
start.sh
View File

@ -33,6 +33,10 @@ export PIHOLE_DNS_
export adlistFile='/etc/pihole/adlists.list'
# If user has set QUERY_LOGGING Env Var, copy it out to _OVERRIDE, else it will get reset when we source the next two files
# Come back to it at the end of the file
[ -n "${QUERY_LOGGING}" ] && QUERY_LOGGING_OVERRIDE="${QUERY_LOGGING}"
# The below functions are all contained in bash_functions.sh
. /bash_functions.sh
@ -59,7 +63,6 @@ prepare_configs
[ -n "${PIHOLE_INTERFACE}" ] && change_setting "PIHOLE_INTERFACE" "$PIHOLE_INTERFACE"
[ -n "${IPV4_ADDRESS}" ] && change_setting "IPV4_ADDRESS" "$IPV4_ADDRESS"
[ -n "${QUERY_LOGGING}" ] && change_setting "QUERY_LOGGING" "$QUERY_LOGGING"
[ -n "${INSTALL_WEB_SERVER}" ] && change_setting "INSTALL_WEB_SERVER" "$INSTALL_WEB_SERVER"
[ -n "${INSTALL_WEB_INTERFACE}" ] && change_setting "INSTALL_WEB_INTERFACE" "$INSTALL_WEB_INTERFACE"
[ -n "${LIGHTTPD_ENABLED}" ] && change_setting "LIGHTTPD_ENABLED" "$LIGHTTPD_ENABLED"
@ -130,4 +133,21 @@ test_configs
[ -f /.piholeFirstBoot ] && rm /.piholeFirstBoot
# Set QUERY_LOGGING value in setupVars to be that which the user has passed in as an ENV var (if they have)
[ -n "${QUERY_LOGGING_OVERRIDE}" ] && change_setting "QUERY_LOGGING" "$QUERY_LOGGING_OVERRIDE"
# Source setupVars.conf to get the true value of QUERY_LOGGING
. ${setupVars}
if [ ${QUERY_LOGGING} == "false" ]; then
echo "::: Disabling Query Logging"
pihole logging off
else
# If it is anything other than false, set it to true
change_setting "QUERY_LOGGING" "true"
# Set pihole logging on for good measure
echo "::: Enabling Query Logging"
pihole logging on
fi
echo " ::: Docker start setup complete"