1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-30 13:10:57 +02:00
Commit Graph

569 Commits

Author SHA1 Message Date
Adam Hill
9a581e0a3e
Merge pull request #372 from pi-hole/block_inplace_update
Block inplace updates (again)
2018-12-24 11:11:15 -06:00
Adam Hill
5b3b0009bc
Added test to confirm updates are blocked
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 12:19:32 -06:00
Adam Hill
319856b52f
Merge branch 'master' of github.com:diginc/docker-pi-hole into block_inplace_update
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 12:04:19 -06:00
Adam Hill
23e65017c1
Merge pull request #370 from pi-hole/dev
Version 4.1
2018-12-16 01:33:08 -06:00
Adam Hill
1d379d07bd
fix hardcoded s6 arch :( woops
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 00:25:48 -06:00
Adam Hill
93bc8e3a29
newer version of pytest for travis
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 19:51:41 -06:00
Adam Hill
e8b23bc582
Work around docker manifests not properly deleting/updating by removing all local manifest cache
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 19:06:02 -06:00
Adam Hill
b3beb91b52
update deploy version to 4.1 and fix broken server test
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:38 -06:00
Adam Hill
b39a2ad69a
arm version complained/crashed on no TTY
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:08 -06:00
Adam Hill
62c1fb49ee
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2018-12-12 20:43:20 -06:00
Adam Hill
d7a125a706
Version 4.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00
Adam Hill
ed26f5d76c
Update install.sh 2018-12-11 14:16:04 -06:00
Adam Hill
d2651d8613
Version 4.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-10 21:29:00 -06:00
Adam Hill
c45bf4c8dd
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2018-11-12 20:35:19 -06:00
Adam Hill
17cc8a2fb7
Merge pull request #360 from reloxx13/patch-1
readme fix dev docker tag
2018-11-07 19:23:19 -06:00
reloxx13
1b2adcf02c
readme fix dev docker tag 2018-11-07 20:58:22 +01:00
Adam Hill
61f701be7a
Merge pull request #358 from pi-hole/synology
Synology sudo audit error fix, disable audit in pam modules
2018-10-31 23:42:35 -05:00
Adam Hill
10c44c9374
switch to using pihole/debian-base for pam fix
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-31 22:40:29 -05:00
Adam Hill
b095881d6f
Merge pull request #359 from pi-hole/non_gnu_awk_ip_lookup
IPRoute v3 ip lookup
2018-10-31 20:14:29 -05:00
Adam Hill
497ae17bf0
generic iproute output parsing
Fixes #346
Fixes #312
2018-10-31 20:11:18 -05:00
Adam Hill
4907bc533d
generic iproute output parsing
Fixes #346
Fixes #312
2018-10-31 20:11:16 -05:00
Adam Hill
a47f278df0
cleanup uncessary build dep stuff
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-30 21:13:34 -05:00
Adam Hill
bceef5e4f6
Merge branch 'master' of github.com:diginc/docker-pi-hole into synology 2018-10-30 00:21:02 -05:00
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