Adam Hill
38d76d7ec8
fix conftest path to VERSION
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 20:37:05 -06:00
Adam Hill
08c2ac2e48
consistent global version var
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 00:09:05 -06:00
Adam Hill
440a7a19a5
v4.2 and Version pulled from a file now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-20 23:59:35 -06:00
Adam Hill
7ec893ae3f
Merge pull request #395 from pi-hole/dev
...
Docker-compose update
2019-01-16 22:42:02 -06:00
Adam Hill
d43675afa3
Merge branch 'master' into dev
2019-01-16 21:50:50 -06:00
Adam Hill
7e21322167
Merge pull request #394 from chapb/patch-1
...
Update with 4.1.1+ requirement for cap_add
2019-01-16 20:35:48 -06:00
Brennan Chapman
17c185b40a
Update with 4.1.1+ requirement for cap_add
...
Uncommented cap_add as required in 4.1.1+ to start DNS service, not just for DHCP.
2019-01-16 20:51:43 -05:00
Adam Hill
3ba80f1071
Merge pull request #390 from vhp/vincent-extra-sleep
...
Extend sleep and add env file for usage
2019-01-13 14:44:55 -06:00
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
2c2b8dfab9
Update wording
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:34:02 -05:00
Vincent Perricone
d25b9adff1
Update gitignore
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:34:02 -05:00
Vincent Perricone
c9050fef72
Update Readme
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:34:02 -05:00
Vincent Perricone
5c53f1c26d
Updates to docker_run
...
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:34:02 -05:00
Adam Hill
a40fcbd990
Merge pull request #389 from pi-hole/Version_fix
...
Small readme tweaks
2019-01-12 19:35:34 -06: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
4119893f76
Merge pull request #386 from pi-hole/dev
...
Readme and startup checks for common issues
2019-01-12 19:26:48 -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
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
Adam Hill
27ed5bdc98
Merge pull request #383 from vhp/vhp-tidy
...
Tidy up docker run script
2019-01-11 22:13:47 -06:00
Adam Hill
5a0a3dd959
Merge pull request #384 from pi-hole/resolvconf_check_and_docs
...
Resolvconf check and docs
2019-01-11 10:12:14 -06:00
Adam Hill
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
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
f5699865da
Merge branch 'master' into resolvconf_check_and_docs
2019-01-10 10:06:32 -06:00
Adam Hill
187a04f501
Update docker_run.sh
...
Exit on error for things like container name or port conflicts
2019-01-10 10:00:39 -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
4a4a2e769f
Merge pull request #373 from homdx/master
...
SELinux policy instruction
2019-01-10 09:52:32 -06:00
Adam Hill
210d272ffe
Merge branch 'master' into master
2019-01-10 09:16:36 -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
Vincent Perricone
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
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
Adam Hill
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
Adam Hill
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
Adam Hill
2336174036
comment tweak
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:21:53 -06:00
Adam Hill
d9ca4187b9
new pihole dev
2019-01-01 13:51:33 -06:00
Adam Hill
26e1c82fd0
Merge pull request #377 from pi-hole/dev
...
Update to v4.1.1
2018-12-29 19:16:21 -06:00
Adam Hill
d0b35cec63
4.1.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -06:00
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
Craig Younkins
b792c7df88
Merge branch 'master' into dhcp
2018-12-17 13:28:40 -05: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
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
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
