docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-05 07:31:04 +02:00
Code Issues Releases Wiki Activity
639 Commits 10 Branches 115 Tags 4.8 MiB
a4c4de3cf4
Commit Graph

639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Hill
a4c4de3cf4 maybe 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
fded8bdcc4 show me your secrets 
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
49d17bded0 back to using 2 dns 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
fea57446a5 revert to old setup 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
41fc498166 Slow down after setup to try to fix test 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
3e76bbd51f add some more details to ouput to debut travis failure 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
7cb09b78db empty the adlist for tests 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
062f94d0f7 Another flaky test, logs of readme 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
cb463d01d2 Fix default block list install 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
1322db7ec3 Slow down all the flakey tests to pass 100% 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
07bc55786b Fixed tests! 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
397ec03285 remove ServerIP requirement, simpler example commands 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Mathieu Hofman
138e061c17 Allow running pihole-FTL as non-root 
- Add a new container environment variable allowing to specify the user to run the pihole-FTL process as. Defaults to root.
- Set inherited capabilities attributes on the pihole-FTL file to automatically grant runtime permitted capabilities when available in the bounding set. This allows dropping root before starting pihole-FTL without failing with a permission error if the capabilities are not available to the container (the process may still error out if performing an operation requiring the capability).
- Add some information on capabilities to the Readme file.

Signed-off-by: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
b72da80f13 hotfix for bad grep 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
3de08b138e change to calling it dnsmasq user 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
040d9fcee6 v4.2.1 & more robust user root fix 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
f7f6949c53 run FTL as root 
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
 2019-05-09 16:50:18 +02:00
Adam Hill
c3bfdfb5de
Merge pull request #411 from pi-hole/production_4.2 
switch to production tags
 2019-02-03 11:56:41 -06:00
Adam Hill
d6642fc191
broken test (works outside tests), not required for release 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-03 11:45:40 -06:00
Adam Hill
e6e8d0015d
Merge branch 'production_4.2' of github.com:diginc/docker-pi-hole into production_4.2 2019-02-03 11:29:07 -06:00
Adam Hill
18de6b3883
install FTL 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-03 11:27:49 -06:00
Adam Hill
f0b8561990
Merge branch 'master' into production_4.2 2019-02-03 10:56:29 -06:00
Adam Hill
7e2986f51c
switch to production tags 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-03 10:55:35 -06:00
Adam Hill
7aab18e0a4
Merge pull request #402 from pi-hole/release/v4.2 
v4.2 and Version pulled from a file now
 2019-02-03 10:54:56 -06:00
Adam Hill
8ece19132d
deploy support for RCs, fix enable test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-02-02 12:59:02 -06:00
Adam Hill
d3309ebb1a
remove old blocking page setup/test 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-21 22:43:38 -06:00
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