From 7adccc0287be16147e2fa038f1d8f03c1c05866d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20L=C3=B6hden?= <3964467+loehden@users.noreply.github.com> Date: Tue, 9 Feb 2021 00:17:28 +0100 Subject: [PATCH 1/8] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Benjamin Löhden <3964467+loehden@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2230051..60dd584 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ There are other environment variables if you want to customize various things in | `VIRTUAL_HOST: `
*Optional* *Default: $ServerIP* | What your web server 'virtual host' is, accessing admin through this Hostname/IP allows you to make changes to the whitelist / blacklists in addition to the default 'http://pi.hole/admin/' address | `IPv6: <"true"\|"false">`
*Optional* *Default: "true"* | For unraid compatibility, strips out all the IPv6 configuration from DNS/Web services when false. | `INTERFACE: `
*Advanced/Optional* | The default works fine with our basic example docker run commands. If you're trying to use DHCP with `--net host` mode then you may have to customize this or DNSMASQ_LISTENING. -| `DNSMASQ_LISTENING: `
*Advanced/Optional* | `local` listens on all local subnets, `all` permits listening on internet origin subnets in addition to local. +| `DNSMASQ_LISTENING: `
*Advanced/Optional* | `local` listens on all local subnets, `all` permits listening on internet origin subnets in addition to local, `single` listens only on the interface specified. | `WEB_PORT: `
*Advanced/Optional* | **This will break the 'webpage blocked' functionality of Pi-hole** however it may help advanced setups like those running synology or `--net=host` docker argument. This guide explains how to restore webpage blocked functionality using a linux router DNAT rule: [Alternative Synology installation method](https://discourse.pi-hole.net/t/alternative-synology-installation-method/5454?u=diginc) | `DNSMASQ_USER: `
*Experimental Default: root* | Allows running FTLDNS as non-root. | `TEMPERATUREUNIT`:
*Optional Default: c* | Set preferred temperature unit to `c`: Celsius, `k`: Kelvin, or `f` Fahrenheit units. From 8cf36e6f7ecf4f66646fae0c111a676947cd0414 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 10 Feb 2021 17:31:31 +0000 Subject: [PATCH 2/8] Remove chmod of no longer used file Signed-off-by: Adam Warner --- bash_functions.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bash_functions.sh b/bash_functions.sh index 520c5b0..d9a00a5 100644 --- a/bash_functions.sh +++ b/bash_functions.sh @@ -27,8 +27,6 @@ prepare_configs() { chown pihole:root /etc/lighttpd chown pihole:pihole "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" "/var/log/pihole" "${regexFile}" chmod 644 "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" - # not sure why pihole:pihole user/group write perms are not enough for web to write...dirty fix: - chmod 777 "${regexFile}" touch /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log chown pihole:pihole /var/run/pihole /var/log/pihole test -f /var/run/pihole/FTL.sock && rm /var/run/pihole/FTL.sock From 29cf35b2c5575c88e3bf9a66ba330ee2c5227c90 Mon Sep 17 00:00:00 2001 From: Tyler Spires Date: Sun, 23 Aug 2020 21:09:24 -0400 Subject: [PATCH 3/8] Fixing error with dhcp.leases too. Signed-off-by: Tyler Spires --- bash_functions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bash_functions.sh b/bash_functions.sh index d9a00a5..984c40c 100644 --- a/bash_functions.sh +++ b/bash_functions.sh @@ -31,6 +31,9 @@ prepare_configs() { chown pihole:pihole /var/run/pihole /var/log/pihole test -f /var/run/pihole/FTL.sock && rm /var/run/pihole/FTL.sock chown pihole:pihole /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /etc/pihole /etc/pihole/dhcp.leases /var/log/pihole.log + if [[ -e /etc/pihole/dhcp.leases ]]; then + chown pihole:pihole /etc/pihole/dhcp.leases + fi chmod 0644 /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log set -e # Update version numbers From c23b1d6894c58fd791f2a104b37f160155da8829 Mon Sep 17 00:00:00 2001 From: Tyler Spires Date: Mon, 24 Aug 2020 08:48:35 -0400 Subject: [PATCH 4/8] forgot to remove the dhcp.leases from the original line. Signed-off-by: Tyler Spires --- bash_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bash_functions.sh b/bash_functions.sh index 984c40c..2b7609d 100644 --- a/bash_functions.sh +++ b/bash_functions.sh @@ -30,7 +30,7 @@ prepare_configs() { touch /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log chown pihole:pihole /var/run/pihole /var/log/pihole test -f /var/run/pihole/FTL.sock && rm /var/run/pihole/FTL.sock - chown pihole:pihole /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /etc/pihole /etc/pihole/dhcp.leases /var/log/pihole.log + chown pihole:pihole /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /etc/pihole /var/log/pihole.log if [[ -e /etc/pihole/dhcp.leases ]]; then chown pihole:pihole /etc/pihole/dhcp.leases fi From 6b6ba9b458a0f7266ba0bf399fc53567cd377127 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 10 Feb 2021 17:46:09 +0000 Subject: [PATCH 5/8] accidentally a reference Signed-off-by: Adam Warner --- bash_functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bash_functions.sh b/bash_functions.sh index 2b7609d..886ff65 100644 --- a/bash_functions.sh +++ b/bash_functions.sh @@ -25,15 +25,15 @@ prepare_configs() { # Re-apply perms from basic-install over any volume mounts that may be present (or not) # Also similar to preflights for FTL https://github.com/pi-hole/pi-hole/blob/master/advanced/Templates/pihole-FTL.service chown pihole:root /etc/lighttpd - chown pihole:pihole "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" "/var/log/pihole" "${regexFile}" + chown pihole:pihole "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" "/var/log/pihole" chmod 644 "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" touch /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log chown pihole:pihole /var/run/pihole /var/log/pihole test -f /var/run/pihole/FTL.sock && rm /var/run/pihole/FTL.sock chown pihole:pihole /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /etc/pihole /var/log/pihole.log - if [[ -e /etc/pihole/dhcp.leases ]]; then - chown pihole:pihole /etc/pihole/dhcp.leases - fi + if [[ -e /etc/pihole/dhcp.leases ]]; then + chown pihole:pihole /etc/pihole/dhcp.leases + fi chmod 0644 /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port /var/log/pihole.log set -e # Update version numbers From a51f69bef980b3dc665396416ee175fe65bf8a83 Mon Sep 17 00:00:00 2001 From: Stephen Souness Date: Fri, 12 Feb 2021 19:23:55 +0000 Subject: [PATCH 6/8] Couple of typos in docs. --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adf19fc..9dccc08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,4 @@ Notes about releases will be documented on [docker-pi-hole's github releases page](https://github.com/pi-hole/docker-pi-hole/releases). Breaking changes will be copied to the top of the docker repo's README file to assist with common upgrade issues. -See the [Pi-hole releases](https://github.com/pi-hole/pi-hole/releases) for details on updates unreleated to docker image releases +See the [Pi-hole releases](https://github.com/pi-hole/pi-hole/releases) for details on updates unrelated to docker image releases diff --git a/README.md b/README.md index 2230051..f1e9f31 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ services: ### Docker Pi-Hole v4.2.2 -- ServerIP no longer a required enviroment variable **unless you run network 'host' mode**! Feel free to remove it unless you need it to customize lighttpd +- ServerIP no longer a required environment variable **unless you run network 'host' mode**! Feel free to remove it unless you need it to customize lighttpd - --cap-add NET_ADMIN no longer required unless using DHCP, leaving in examples for consistency ### Docker Pi-Hole v4.1.1+ From dad930f9d29848381dc140f31fec704afb1db79c Mon Sep 17 00:00:00 2001 From: Sachin Sunder Sagadevan Date: Mon, 15 Feb 2021 20:17:05 -0800 Subject: [PATCH 7/8] fixing typos in ReadMe Signed-off-by: Sachin Sunder Sagadevan --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2230051..d70d3eb 100644 --- a/README.md +++ b/README.md @@ -220,11 +220,11 @@ Do not attempt to upgrade (`pihole -up`) or reconfigure (`pihole -r`). New imag * We will try to put common break/fixes at the top of this readme too 1. Download the latest version of the image: `docker pull pihole/pihole` 2. Throw away your container: `docker rm -f pihole` - * **Warning** When removing your pihole container you may be stuck without DNS until step 3; **docker pull** before **docker rm -f** to avoid DNS inturruption **OR** always have a fallback DNS server configured in DHCP to avoid this problem altogether. + * **Warning** When removing your pihole container you may be stuck without DNS until step 3; **docker pull** before **docker rm -f** to avoid DNS interruption **OR** always have a fallback DNS server configured in DHCP to avoid this problem altogether. * If you care about your data (logs/customizations), make sure you have it volume-mapped or it will be deleted in this step. 3. Start your container with the newer base image: `docker run pihole/pihole` (`` being your preferred run volumes and env vars) -Why is this style of upgrading good? A couple reasons: Everyone is starting from the same base image which has been tested to known it works. No worrying about upgrading from A to B, B to C, or A to C is required when rolling out updates, it reducing complexity, and simply allows a 'fresh start' every time while preserving customizations with volumes. Basically I'm encouraging [phoenix server](https://www.google.com/?q=phoenix+servers) principles for your containers. +Why is this style of upgrading good? A couple reasons: Everyone is starting from the same base image which has been tested to known it works. No worrying about upgrading from A to B, B to C, or A to C is required when rolling out updates, it reduces complexity, and simply allows a 'fresh start' every time while preserving customizations with volumes. Basically I'm encouraging [phoenix server](https://www.google.com/?q=phoenix+servers) principles for your containers. To reconfigure Pi-hole you'll either need to use an existing container environment variables or if there is no a variable for what you need, use the web UI or CLI commands. From 3f0a7d85b1a5386697fda4aa75e0a35f301af41a Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 16 Feb 2021 19:50:09 +0000 Subject: [PATCH 8/8] bump web version Signed-off-by: Adam Warner --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index fef00ac..c120dd6 100644 --- a/install.sh +++ b/install.sh @@ -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.3.2" +export WEB_VERSION="v5.4" # Only use for pre-production / testing export CHECKOUT_BRANCHES=false