docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-02 06:00:56 +02:00
Code Issues Releases Wiki Activity
1,172 Commits 12 Branches 115 Tags 4.8 MiB
a5eda6844e
Commit Graph

1172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Spires
c23b1d6894
forgot to remove the dhcp.leases from the original line. 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2021-02-10 17:31:47 +00:00
Tyler Spires
29cf35b2c5
Fixing error with dhcp.leases too. 
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
 2021-02-10 17:31:33 +00:00
Adam Warner
8cf36e6f7e
Remove chmod of no longer used file 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-02-10 17:31:31 +00:00
Benjamin Löhden
7adccc0287 Update README.md 
Signed-off-by: Benjamin Löhden <3964467+loehden@users.noreply.github.com>
 2021-02-09 00:17:28 +01:00
Adam Warner
7c135f5ce8
Merge pull request #777 from pi-hole/master 
master->dev
 2021-01-27 18:38:37 +00:00
Adam Warner
79ead80720
Merge pull request #776 from pi-hole/dev 
v5.6 Release
 2021-01-27 18:34:45 +00:00
Adam Warner
302924a3e2
Merge branch 'master' into dev 2021-01-27 18:16:33 +00:00
Adam Warner
0a8d174ef7
prep for new release 2021-01-27 18:11:32 +00:00
Adam Warner
5735495ec7
Merge pull request #771 from MichaIng/patch-2 
Skip full distro check on start
 2021-01-27 17:42:58 +00:00
MichaIng
512f610afa Skip full distro check on start 
The distro_check function includes updating the APT cache, checking for dependencies, which is both not required on Docker start where all required packages are installed already. The only required steps from this function is the webserver user and config file names, which can be applied directly instead since we know that the Pi-hole Docker container is based on Debian.

Furthermore this solves the issue that updating the APT cache fails, when Pi-hole itself is used for DNS resolution, since pihole-FTL has not yet been started at this stage. That failure was not visible since "apt-get update" does not exist with error code (currently) when facing DNS resolving issues, even if not a single list could have been updated, and no other step is done that would require DNS resolving, until pihole-FTL is started. For a regular (non-Docker) install or update it is however reasonable to error out directly when the APT cache could not have been updated, to not defer the exit unnecessarily to a harder-to-debug stage.

Signed-off-by: MichaIng <micha@dietpi.com>
 2021-01-24 15:14:18 +01:00
Ignacio Serrano
e40ed3b5cc update doc README.md with DHCP server setup 
Signed-off-by: Ignacio Serrano <ignic@ignic.com>
 2021-01-23 21:23:05 +01:00
Ignacio Serrano
c5f682d1e7 allows DHCP server setup with env vars 
Signed-off-by: Ignacio Serrano <ignic@ignic.com>
 2021-01-23 21:23:05 +01:00
Adam Warner
4902b4cc6a
Merge pull request #765 from pi-hole/dev 
Release 5.5
 2021-01-19 12:55:39 +00:00
Adam Warner
0f618ffc31
bump core and web version numbers 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-01-19 12:41:46 +00:00
Adam Warner
91fd3933aa
Merge pull request #761 from pi-hole/master 
Master back into Dev
 2021-01-16 20:28:22 +00:00
Adam Warner
c75ca906e7
Merge pull request #760 from pi-hole/fix/latest-tag 
Use Location: header for GitHub API call for latest tag detection.
 2021-01-16 20:07:19 +00:00
Dan Schaper
494667c85d
Use Location: header for GitHub API call 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-01-16 11:45:26 -08:00
Adam Hill
9bcd8e163a
Merge pull request #758 from pi-hole/dev 
Latest versions to master
 2021-01-16 09:13:07 -06:00
Adam Warner
b154947cb9
Merge branch 'master' into dev 2021-01-16 13:05:57 +00:00
Adam Warner
1d35a336b4
Merge pull request #754 from pi-hole/fix/query_logging 
Ensure that QUERY_LOGGING value is persisted between container runs
 2021-01-16 12:34:29 +00:00
Adam Warner
0d9fc510cf
Merge pull request #757 from pi-hole/release-prep 
Prepare for new release
 2021-01-16 12:34:02 +00:00
Adam Warner
1aefa3b063
bump core and web version numbers (we _have_ to find a better way!) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-01-15 20:42:32 +00:00
Adam Warner
39090babf5
Ensure that QUERY_LOGGING value is persisted between container runs 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-01-09 21:45:17 +00:00
Emilien Klein
8f53e1bd22 Using pi.hole as hostname 
To be consistent with the parameter already defined in docker_run.sh
(leaving the jwilder-proxy example to pihole.yourDomain.lan to be 
consistent with the rest of that file's content, namely DEFAULT_HOST)
 2020-12-27 16:10:45 +01:00
Emilien Klein
64a1f548ef Add hostname to docker-compose 
If this is not set, the PiHole admin page shows the Docker container's 
ID as hostname instead.
 2020-12-27 15:24:29 +01:00
Adam Warner
5c21f146f4
Merge pull request #741 from pi-hole/dev 
v5.2.2 and various to master
 2020-12-25 00:04:17 +00:00
Adam Hill
99b6dc9503
Merge pull request #740 from pi-hole/release-prep 
Bump Version number to latest Pi-hole Core
 2020-12-24 13:56:51 -06:00
Adam Warner
a445507627
Bump to latest Pi-hole core version (web is at the same version currently) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-24 11:20:32 +00:00
Adam Warner
f445660079
Merge pull request #739 from shaderecker/typos 
Fix typo in cronjob comment
 2020-12-23 19:02:44 +00:00
Adam Warner
c0bf6c91f6
Merge pull request #738 from shaderecker/docu 
Documentation updates
 2020-12-23 18:58:34 +00:00
Sebastian Haderecker
a6eaf7313c Fix typo in cronjob comment 
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
 2020-12-23 18:18:18 +00:00
Sebastian Haderecker
5dbf46aa05 Fix formatting, typos and the link 
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
 2020-12-23 16:21:23 +00:00
Sebastian Haderecker
6ef8ef1f15 We use Github Actions 
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
 2020-12-23 16:03:22 +00:00
Sebastian Haderecker
7485a84d2d Remove broken symlink 
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
 2020-12-23 15:50:23 +00:00
Adam Warner
e6bff1ac32
Merge pull request #727 from pi-hole/new/setallthedns 
Re-jig how Pi-hole's upstream DNS servers are set
 2020-12-19 18:43:36 +00:00
Adam Hill
f1cc22e5e0
Merge pull request #731 from pi-hole/master 
Sync master to dev
 2020-12-19 12:37:24 -06:00
Adam Warner
325c49f7b3
Merge pull request #722 from dfsx1/dev 
Upgrade s6-overlay to v2.1.0.2
 2020-12-19 18:06:24 +00:00
Adam Warner
0cb7324a60
Further simplifications 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-16 22:19:20 +00:00
Adam Warner
f77e4609ce
Introduce new env VAR for setting PIHOLE_DNS_x values. 
If not set, keep existing values in setupVars
if no existing values in setupVars - fall back to defaults

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-16 21:41:09 +00:00
Adam Warner
b0a14b7eb9
Merge pull request #721 from pi-hole/tweak/envVars 
Prevent unset env vars overwriting setupvars.conf values
 2020-12-16 18:03:42 +00:00
Dan Schaper
c525df56fa
Merge pull request #725 from pi-hole/update/remove-traefik-docs 
Remove outdated configuration
 2020-12-13 14:18:55 -08:00
Dan Schaper
02a28b25ae
Remove outdated configuration 
This uses environment variables that do not exist.
 2020-12-11 10:06:13 -08:00
dfsx1
9bdfe868bd S6_VERSION: v2.1.0.2 
https://github.com/just-containers/s6-overlay/releases/tag/v2.1.0.2

Signed-off-by: dfsx1 <dfsx1@users.noreply.github.com>
 2020-12-07 21:58:04 +01:00
Adam Warner
5d1d394b1b
Test for env vars being set before changing settings. Should preserve values set in setupVars.conf 
Co-authored-by: xBelladonna <isabelladonnamoore@outlook.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-04 11:20:16 +00:00
Adam Warner
8c62a1437a
Merge pull request #690 from damajor/patch-1 
Add QUERY_LOGGING missing export
 2020-12-03 18:18:12 +00:00
Adam Hill
89972b3ce5
Merge pull request #717 from pi-hole/dev 
Dev to Master [5.2.1]
 2020-12-02 16:38:10 -06:00
Adam Warner
90dada0a8a
prep dev for 5.2.1 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-12-02 21:34:25 +00:00
Adam Warner
121f3f92c9
Merge pull request #714 from mparramont/patch-1 
Fix file to copy in  README.md
 2020-12-02 21:32:52 +00:00
Adam Warner
ee42fdae04
Merge pull request #712 from pi-hole/tweak/REV_SERVER 
Introduce new REV_SERVER environment variables. Deprecate CONDITIONAL_FORWARDING ones, but maintain backward compatibility
 2020-12-02 21:31:38 +00:00
Miguel Parramon
b669826149 Update README.md 
😄

Signed-off-by: Miguel Parramón <mparramont@gmail.com>
 2020-12-02 15:36:57 +08:00