Adam Hill
83cd82906d
Merge branch 'master' into vincent-extra-sleep
2019-01-13 13:49:37 -06:00
Vincent Perricone
403a205b2a
Remove excess bash from Readme
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-13 14:48:27 -05:00
Adam Hill
1c34c2a1ee
Fix extra tic in docker run, indendation
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-13 13:47:39 -06:00
Adam Hill
a8e1746476
FTLDNS
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-13 13:02:20 -06:00
Vincent Perricone
98faf1e5f9
Move docker args to bottom for --env-file to put with other Optionals
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:36:17 -05:00
Vincent Perricone
c9050fef72
Update Readme
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:34:02 -05:00
Adam Hill
f1f3e35086
Small readme tweaks
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-12 19:34:35 -06:00
Adam Hill
b2aecc497a
remove comment mid docker run, it breaks the command
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-12 17:34:34 -06:00
Adam Hill
d4a7059bef
Merge branch 'dev' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs
2019-01-10 20:55:15 -06:00
Adam Hill
a7a5ef516b
Merge branch 'master' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs
2019-01-10 20:05:40 -06:00
Adam Hill
547d1f6b9b
Merge pull request #374 from cyounkins/dhcp
...
net=host is the only way to use DHCP
2019-01-10 09:55:38 -06:00
Adam Hill
f3cf5dc858
Adding test and check for resolv.conf
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-10 00:28:39 -06:00
Adam Hill
19fee6fa5e
README update for 4.1.1 and test improvement
...
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-08 21:01:42 -06:00
Craig Younkins
5ded3accab
net=host is the only way to use DHCP
...
Signed-off-by: Craig Younkins <cyounkins@gmail.com>
2018-12-14 14:22:50 -05:00
homdx
94331af79c
SELinux policy instruction
2018-12-12 23:56:35 +03:00
reloxx13
1b2adcf02c
readme fix dev docker tag
2018-11-07 20:58:22 +01:00
Adam Hill
4907bc533d
generic iproute output parsing
...
Fixes #346
Fixes #312
2018-10-31 20:11:16 -05:00
Steven
89a7c7f022
README.md - fixed typo
2018-10-25 05:24:26 +00: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
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
710f7bff27
Merge branch 'master' of github.com:diginc/docker-pi-hole into development
2018-10-15 22:11:42 -05:00
Elias Ojala
ecb9ecee37
Added syntax highlighting
...
Signed-off-by: Elias Ojala <git@eliasojala.me>
2018-10-11 21:02:20 +03:00
Adam Hill
dcd70b62eb
Merge branch 'master' into patch-1
2018-09-18 00:25:32 -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
797a9213e4
Adding helpful comment for copy paste to Dockerhub/Store
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 19:46:12 -05:00
Adam Hill
c56385ad49
remove multiarch and comments from readme (dockerhub does not high comments)
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 19:43:05 -05:00
Adam Hill
5cc28d769a
Updated deploy script (still needs work), fixed dead link
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 19:33:45 -05:00
Adam Hill
5ee2cc947c
Better writing for second half of 443 sinkhold section
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:17:06 -05:00
Adam Hill
1c063a6619
change password interactively to avoid leaving bash history
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:08:24 -05:00
Adam Hill
df63b3ee12
image to top, links fix, better writing for 443 sinkhole
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:04:35 -05:00
Adam Hill
3c135774d3
image to html the same as main repo's
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:55:08 -05:00
Adam Hill
c8d7abed1b
image, theirs=ours, dockers=docker containers
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:52:08 -05:00
Adam Hill
a257be134d
Typo, "Pi-hole" consistantly
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:43:56 -05:00
Adam Hill
7b06920cd0
travis link fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:36:34 -05:00
Adam Hill
1f49971046
multiarch reference removed
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:34:26 -05:00
Adam Hill
a4296416b0
readme updates
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:28:33 -05:00
Adam Hill
6e15abd002
more readme old debian tags
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 12:06:51 -05:00
Adam Hill
805c5ccdb7
more /diginc/ references updated
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:44:24 -05:00
Adam Hill
73f05e6d35
A bunch of name changes
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:40:37 -05:00
Adam Hill
43aa8f45d8
armel readme update
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:54:52 -05:00
diginc
1b96d7e760
Merge branch 'dev' of github.com:diginc/docker-pi-hole into more_ports
2018-07-10 23:14:27 -05:00
diginc
6364640d4f
readme updates
2018-07-10 23:11:44 -05:00
StefanSchoof
3171feef4c
allow no for DNS2
2018-07-06 08:01:41 +00:00
diginc
cd6f2790bd
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2018-07-05 20:51:20 -05:00
Claudio Ramirez
d12a876f8f
typo
2018-05-08 21:07:50 +02:00
Claudio Ramirez
e10a200d70
fmt
2018-05-04 17:17:53 +02:00
Claudio Ramirez
17b3781dd4
Safe workaround for slow loading pages (scripts that make SSL connections to blocked domains)
2018-05-04 17:16:49 +02:00