docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
1,126 Commits 9 Branches 114 Tags 4.5 MiB
Commit Graph

1126 Commits

Author SHA1 Message Date
Adam Warner 0cceed3c83
Merge branch 'master' into dev 2021-09-06 22:43:22 +01:00
DL6ER 300fcf0c9e
Merge pull request #916 from pi-hole/fix/capabilities 
Add CAP_SYS_NICE, CAP_IPC_LOCK, CAP_CHOWN capabilites recommendation
 2021-09-06 23:24:24 +02:00
DL6ER ec3b4609bc
Add CAP_SYS_NICE, CAP_IPC_LOCK, CAP_CHOWN capabilites recommendation 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-09-06 22:33:09 +02:00
Adam Warner 22ce49a123
Update nightly-build beta-v5.9.yml 2021-09-01 16:47:17 +01:00
Adam Warner d821dcb2f0
Merge pull request #899 from majabojarska/fix_readme_typos 
Fix README.md typos: "Descrption"
 2021-08-26 09:33:43 +01:00
Adam Warner ef54216986
Merge pull request #897 from pi-hole/feature/dependabot-actions 
Dependabot manage GHA versions.
 2021-08-26 09:32:38 +01:00
Dan Schaper 93092da023
Merge branch 'master' into feature/dependabot-actions 2021-08-25 14:22:58 -07:00
Adam Warner 3153346ec8
Merge pull request #905 from shaderecker/dev 
Improve Docker Healthcheck: Shorten dig output
 2021-08-22 22:45:41 +01:00
Sebastian Haderecker ee6e1b36a9 Healthcheck: Shorten dig output 
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
 2021-08-22 22:04:36 +02:00
Adam Warner 73ad23b3b6
Merge branch 'dev' 2021-08-21 13:48:32 +01:00
Adam Warner 8700afa74d
Add a nightly job for beta-v5.9 build. I keep forgetting to do it. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-21 13:48:17 +01:00
Adam Warner 1f19941b4c
Merge branch 'dev' 2021-08-20 20:03:48 +01:00
Adam Warner d69a8febae
Merge pull request #902 from pi-hole/fix/ServerIP 
Set FTL REPLY addresses instead of setupVars.conf.
 2021-08-20 11:54:47 +01:00
Dan Schaper a26eb9c6ad
Set FTL REPLY addresses instead of setupVars.conf. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-08-19 17:29:54 -07:00
Maja Bojarska 2fcc4f66ee Fix typos "Descrption" 2021-08-15 14:15:09 +02:00
Dan Schaper 066f891cc1
Dependabot manage GHA versions. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-08-13 21:51:01 -07:00
Adam Warner f50ce4637f
Merge branch 'dev' 2021-08-06 01:27:57 +01:00
Adam Warner 56f4933237
Add an addional version injection case, for when core versions are not on alternative branches. 
Move ENV VAR up higher in the Dockerfile so that `install.sh` actually sees it...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-06 01:27:45 +01:00
Adam Warner ea95c4f3e5
Merge branch 'dev' 2021-08-05 20:21:43 +01:00
Adam Warner 88518b036d
Inject the container tag into the web interface footer 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 20:21:35 +01:00
Adam Warner eb36372dea
Merge branch 'dev' 2021-08-05 13:05:48 +01:00
Adam Warner 3865e77c6e
Introduce internal PIHOLE_TAG variable so that we can see what tag the container is... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-05 00:59:34 +01:00
Adam Warner 388f0f01a1
Disable some more `pihole` functions when run from within docker 
Inject a message into the debug output that lets us know it's been run in a docker container

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 23:41:39 +01:00
Adam Warner 6c3ccfcd4f
Merge pull request #893 from pi-hole/dev 
Sync dev into master
 2021-08-04 19:16:12 +01:00
Adam Warner bdaf352a23
Allow for passing in optional branch name to workflow_dispatch build 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 18:52:37 +01:00
Adam Warner 55b257126b
bump web_version 2021-08-04 18:44:04 +01:00
Adam Warner 1f1dc03a69
Merge pull request #888 from DistractionRectangle/Set-Phasers-to-Stun 
Remove Unneccessary kill -9
 2021-08-04 18:43:09 +01:00
Adam Warner 2b2e05dce3
Merge pull request #890 from danifr/patch-1 
Use nginxproxy's DockerHub registry
 2021-08-04 18:42:18 +01:00
Adam Warner 451fc19432
Merge branch 'dev' into patch-1 2021-08-04 18:41:56 +01:00
Adam Warner 8d536703d9
Merge branch 'master' into patch-1 2021-08-04 18:41:37 +01:00
Adam Warner 58e1eac241
Merge pull request #857 from orazioedoardo/fix-dns-bogus-priv 
Fix DNS_BOGUS_PRIV description
 2021-08-04 18:36:59 +01:00
Adam Warner 91d75416b8
Merge branch 'dev' into fix-dns-bogus-priv 2021-08-04 18:36:18 +01:00
Adam Warner e65890208b
Merge pull request #869 from tlgs/master 
Add documentation for WEBPASSWORD_FILE
 2021-08-04 18:34:58 +01:00
Adam Warner 559b317148
Merge branch 'dev' into master 2021-08-04 18:32:59 +01:00
Adam Warner 92999dff08
Merge pull request #886 from gbrsni/dev 
Small correction in the 'Quick Start' section of the README
 2021-08-04 18:29:00 +01:00
Adam Warner 1c6ba2d3c7
Merge pull request #882 from pi-hole/rem-debconf-set-selections 
Remove no longer needed workaround for resolvconf
 2021-08-04 18:27:55 +01:00
Adam Warner a45725ed37
Merge pull request #883 from DistractionRectangle/fix-gravitydb-check 
Fix gravityDB check
 2021-08-04 16:51:17 +01:00
Adam Warner e98dff970f
Merge branch 'dev' into rem-debconf-set-selections 2021-08-04 16:40:05 +01:00
Adam Warner e674bb4b81
Merge branch 'dev' into fix-gravitydb-check 2021-08-04 16:39:12 +01:00
Adam Warner 6820b2e55c
Merge branch 'dev' into Set-Phasers-to-Stun 2021-08-04 16:39:06 +01:00
Adam Warner cec28c79f4
Merge pull request #892 from pi-hole/tweak/multiarch-image-rebuild 
Switch `multiarch/debian-debootstrap` to `pihole/debian-debootstrap` to fix build issues
 2021-08-04 16:37:15 +01:00
Adam Warner a44b7f1205
Use the rebuild images in the `pihole` namespace 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 15:50:12 +01:00
Adam Warner bf82c2e8f5
[skip ci] Merge new envvar layout from master into dev 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 11:36:55 +01:00
Daniel Fernández 73f1cb3e74 Use nginxproxy's DockerHub registry 
The official nginx-proxy repo is transitioned away from jwilder/nginx-proxy
ad7c02570b

Signed-off-by: Daniel Fernández <daferoes@gmail.com>
 2021-08-04 11:23:10 +02:00
Dan Schaper 8565c3828d
[skip ci] Break out defaults and values for clarity. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-08-03 13:43:44 -07:00
Dan Schaper d0e6b77fdb
Break out defaults and values for clarity. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2021-08-03 12:06:09 -07:00
gbrsni b5046af667
Update README.md 
Now suggesting usage of the '-d' flag.
 2021-07-28 07:56:31 +00:00
D.Rect 408f71a480 Remove Unneccessary kill -9 
Since piholeFTL test properly spins down it's no longer
necessary to kill it. He's dead Jim

Merge #300, added `piholeFTL test` to the startup sequence to
replace dnsmasq as a dependency for validate_env and gravity.sh.
kill -9 was kept as a work around to a standing issue that
`piholeFTL test` didn't spin down on it's own. This was fixed
in pi-hole/FTL#1067, landed on Apr 14 2021 and confirmed
working, as evinced by #834 which was filed the same day it
that fix landed.

Signed-off-by: D.Rect <48034372+DistractionRectangle@users.noreply.github.com>
 2021-07-25 08:25:35 -07:00
D.Rect 7650896158 Fix gravityDB check 
piholeFTL exposes configuration to relocate/rename gravityDB so
we cannot just check a hard coded location. This commit greps
pihole-FTL.conf for a custom location. Since pihole-FTL.conf
will eventually be replaced by TOML, some verbosity is added to
denote what config file is being checked and what location it
ultimately ended up checking.

Signed-off-by: D.Rect <48034372+DistractionRectangle@users.noreply.github.com>
 2021-07-24 15:20:38 -07:00
Adam Warner 4dba6339c7
Remove no longer needed workaround for resolvconf 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-21 21:31:34 +01:00