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

646 Commits

Author SHA1 Message Date
Adam Hill 88bec8766a
fixing synology pam 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-30 00:20:50 -05:00
Adam Hill 0c2ba8f5b2
Merge branch 'development' of github.com:diginc/docker-pi-hole into development 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-27 12:07:04 -05:00
Adam Hill e87b2ff6f6
Merge pull request #350 from PeterDaveHelloKitchen/improve-Dockerfile 
Refactor Dockerfile for smaller and less layer image
 2018-10-27 12:04:33 -05:00
Adam Hill 88229a5f26
Merge branch 'development' of github.com:diginc/docker-pi-hole into development 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-27 12:02:23 -05:00
Adam Hill b931633808
Merge pull request #334 from dhutchison/development 
Implemented missing support for DNSMASQ_LISTENING environment variable

Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-27 12:01:48 -05:00
Adam Hill 3870154ae3
Merge pull request #334 from dhutchison/development 
Implemented missing support for DNSMASQ_LISTENING environment variable
 2018-10-27 12:01:04 -05:00
Adam Hill ebfb3cda79
Merge pull request #351 from stevenw/patch-1 
README.md - fixed typo
 2018-10-27 11:59:12 -05:00
Steven 89a7c7f022
README.md - fixed typo 2018-10-25 05:24:26 +00:00
Peter Dave Hello d25aefbf8d Refactor Dockerfile for smaller and less layer image 
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
 2018-10-25 12:05:07 +08:00
Adam Hill 775fa06102
Merge pull request #347 from pi-hole/readme-tweaks 
Update README.md
 2018-10-21 15:16:09 -05:00
Adam Hill e995ed2f45
Merge pull request #349 from pi-hole/audit_error_fix 
Audit error fix
 2018-10-21 15:14:57 -05:00
Adam Hill cb87448371
Long awaited synology audit error fix ;) 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-21 15:08:30 -05:00
Adam Hill 2d1c515d25
Update README.md 2018-10-20 23:40:16 -05:00
Adam Hill c290324185
Change password logic completely to avoid any extra debug prints 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-16 19:57:25 -05:00
Adam Hill f1b34887f8
The debug printing logic was inverted here. Left on without debug enabled, turned off when debug was enabled 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-16 19:14:02 -05:00
Adam Hill 7c12efc851
Merge pull request #343 from pi-hole/development 
Development to master
 2018-10-16 11:43:48 -05:00
Adam Hill e410f69f52
Clarify the secondary DNS being optional 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-16 09:19:37 -05:00
Adam Hill 173707fb2d
adding more dns setting documentation 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-15 22:35:13 -05:00
Adam Hill 38ab3afae1
deploy script update 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-15 22:13:58 -05:00
Adam Hill 710f7bff27
Merge branch 'master' of github.com:diginc/docker-pi-hole into development 2018-10-15 22:11:42 -05:00
Adam Hill 6466099ada
Merge pull request #338 from mahzilla/add-dns-to-doco-example-yml 
Update doco-example.yml with dns flags
 2018-10-15 22:08:12 -05:00
Adam Hill 72fc43bd10
Merge branch 'master' into add-dns-to-doco-example-yml 2018-10-15 21:57:21 -05:00
Adam Hill 148fd8579e
Merge pull request #339 from theel0ja/patch-1 
Added syntax highlighting
 2018-10-15 21:57:00 -05:00
Elias Ojala ecb9ecee37 Added syntax highlighting 
Signed-off-by: Elias Ojala <git@eliasojala.me>
 2018-10-11 21:02:20 +03:00
Kevin Mah b249633b5a Update doco-example.yml with dns flags 
Signed-off-by: Kevin Mah <mahzilla@gmail.com>
 2018-10-10 08:11:59 -07:00
David Hutchison 7515c10a69 Implemented missing support for DNSMASQ_LISTENING environment variable 
Signed-off-by: David Hutchison <dhutchison86+github@googlemail.com>
 2018-09-29 22:20:33 +01:00
Adam Hill cf551180e7
explicitely pin debian slim image (no change, just an alias for old image) 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-09-24 21:25:00 -05:00
Adam Hill 9f18ae0e4b
Merge pull request #332 from pi-hole/fix_password 
Fix password
 2018-09-18 19:22:56 -05:00
Adam Hill ca1a8e9117
Merge branch 'development' of github.com:diginc/docker-pi-hole into fix_password 2018-09-18 00:27:09 -05:00
Adam Hill 5bef5f15ff
Merge branch 'master' of github.com:diginc/docker-pi-hole into fix_password 2018-09-18 00:26:47 -05:00
Adam Hill d57adabf0c
Merge pull request #322 from zanglang/patch-1 
Typo in README.md
 2018-09-18 00:25:59 -05:00
Adam Hill dcd70b62eb
Merge branch 'master' into patch-1 2018-09-18 00:25:32 -05:00
Adam Hill 63f2c4ea00
Fixing error with random passwords, null checking moved earlier 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-09-18 00:11:26 -05:00
Adam Hill 0dec8ad9f4
Update README.md 
Adding Docker Pi-hole to top for SEO
 2018-09-10 14:12:45 -05:00
Jerry Chong cbc650a9aa
Update README.md 
Fix a minor typo
 2018-08-23 16:26:25 +08:00
Adam Hill 5e559df1d0
Merge pull request #317 from pi-hole/development 
Development to master
 2018-08-15 09:57:01 -05:00
Adam Hill d7ad16e6d6
removing deprecation 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-14 22:39:03 -05:00
Adam Hill 008bee5d50
Merge pull request #314 from codestation/feature-manifest 
Create docker manifest for multiarch support
 2018-08-13 23:39:26 -05:00
Adam Hill 375c6605b6
Update deploy_docker.sh 
development on same image name & tweak to latest condition
 2018-08-13 23:37:15 -05:00
codestation fcae03a955 create docker manifest for multiarch support 2018-08-12 15:30:40 -05:00
Adam Hill 5eaa3207b7
Merge pull request #307 from pi-hole/dnsmasq-test 
Dnsmasq config test
 2018-08-10 16:35:41 -05:00
Adam Hill d1c0ed9bf3
Dnsmasq config test 
Exit during container startup if dnsmasq configs have any issues
 2018-08-07 15:53:38 -05:00
Adam Hill bc8e746546
Merge pull request #304 from pi-hole/fix_setting_loss_on_restart 
Fix setting loss on restart (4.0)
 2018-08-06 09:06:28 -05:00
Adam Hill 96647b1269
Merge branch 'master' into fix_setting_loss_on_restart 2018-08-06 07:48:00 -05:00
Adam Hill 41b1d04100
Do not delete the setting before sourcing the file :} 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-06 07:46:29 -05:00
Adam Hill 625defbf11
Merge pull request #300 from pi-hole/release/v4.0 
Release/v4.0
 2018-08-06 07:44:35 -05:00
Adam Hill f8d37693ed
Fix regex writing for web, fix deploying latest 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-05 22:23:22 -05:00
Adam Hill 65a1ac7f1e
grab version on startup for web footer. 2 tests stablized 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-05 18:20:55 -05:00
Adam Hill 999f02b598
start of fixing race condition by not having test+s6 both run /start.sh 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-05 18:13:25 -05:00
Adam Hill cb0fffa26f
disable armel(broken in 4.0 for now) 2018-08-05 13:18:57 -05:00