a40fcbd990
Merge pull request #389 from pi-hole/Version_fix
...
Small readme tweaks
2019-01-12 19:35:34 -06:00
f1f3e35086
Small readme tweaks
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-12 19:34:35 -06:00
4119893f76
Merge pull request #386 from pi-hole/dev
...
Readme and startup checks for common issues
2019-01-12 19:26:48 -06:00
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
8d8f990db8
Updating docker_run loop to not run infinitely
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-11 22:23:31 -06:00
27ed5bdc98
Merge pull request #383 from vhp/vhp-tidy
...
Tidy up docker run script
2019-01-11 22:13:47 -06:00
5a0a3dd959
Merge pull request #384 from pi-hole/resolvconf_check_and_docs
...
Resolvconf check and docs
2019-01-11 10:12:14 -06:00
c7d9bc7dea
Merge branch 'resolvconf_check_and_docs' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs
2019-01-10 21:20:36 -06:00
d4a7059bef
Merge branch 'dev' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs
2019-01-10 20:55:15 -06:00
a7a5ef516b
Merge branch 'master' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs
2019-01-10 20:05:40 -06:00
f5699865da
Merge branch 'master' into resolvconf_check_and_docs
2019-01-10 10:06:32 -06:00
187a04f501
Update docker_run.sh
...
Exit on error for things like container name or port conflicts
2019-01-10 10:00:39 -06:00
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
4a4a2e769f
Merge pull request #373 from homdx/master
...
SELinux policy instruction
2019-01-10 09:52:32 -06:00
210d272ffe
Merge branch 'master' into master
2019-01-10 09:16:36 -06:00
f3cf5dc858
Adding test and check for resolv.conf
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-10 00:28:39 -06:00
6ab7d727e2
Remove trailing whitespace, cleanup output and add wait to ensure password is printed
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-09 23:15:35 -05:00
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
aac258ad1c
Merge pull request #380 from pi-hole/dev
...
Disable debug logging & docker logging stdout of pihole-FTL
2019-01-02 23:29:04 -06:00
a5211510db
Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN)
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:46:34 -06:00
2336174036
comment tweak
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:21:53 -06:00
d9ca4187b9
new pihole dev
2019-01-01 13:51:33 -06:00
26e1c82fd0
Merge pull request #377 from pi-hole/dev
...
Update to v4.1.1
2018-12-29 19:16:21 -06:00
d0b35cec63
4.1.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -06:00
9a581e0a3e
Merge pull request #372 from pi-hole/block_inplace_update
...
Block inplace updates (again)
2018-12-24 11:11:15 -06:00
b792c7df88
Merge branch 'master' into dhcp
2018-12-17 13:28:40 -05:00
5b3b0009bc
Added test to confirm updates are blocked
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 12:19:32 -06:00
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
23e65017c1
Merge pull request #370 from pi-hole/dev
...
Version 4.1
2018-12-16 01:33:08 -06:00
1d379d07bd
fix hardcoded s6 arch :( woops
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 00:25:48 -06:00
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
93bc8e3a29
newer version of pytest for travis
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 19:51:41 -06:00
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
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
b39a2ad69a
arm version complained/crashed on no TTY
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:08 -06:00
62c1fb49ee
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2018-12-12 20:43:20 -06:00
d7a125a706
Version 4.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00
94331af79c
SELinux policy instruction
2018-12-12 23:56:35 +03:00
ed26f5d76c
Update install.sh
2018-12-11 14:16:04 -06:00
d2651d8613
Version 4.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-10 21:29:00 -06:00
c45bf4c8dd
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2018-11-12 20:35:19 -06:00
17cc8a2fb7
Merge pull request #360 from reloxx13/patch-1
...
readme fix dev docker tag
2018-11-07 19:23:19 -06:00
1b2adcf02c
readme fix dev docker tag
2018-11-07 20:58:22 +01:00
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
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
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
497ae17bf0
generic iproute output parsing
...
Fixes #346
Fixes #312
2018-10-31 20:11:18 -05:00
4907bc533d
generic iproute output parsing
...
Fixes #346
Fixes #312
2018-10-31 20:11:16 -05:00
a47f278df0
cleanup uncessary build dep stuff
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-30 21:13:34 -05:00
bceef5e4f6
Merge branch 'master' of github.com:diginc/docker-pi-hole into synology
2018-10-30 00:21:02 -05:00
Adam Hill
Vincent Perricone
Craig Younkins
homdx
reloxx13