Commit Graph

38 Commits

Author SHA1 Message Date
Daniel cf6d74a2be
Improve healthcheck responsiveness.
By default, dig will retry 2 times (for a total of 3 attempts) to get a response back. Each attempt defaults to 5 seconds. Before this change, a single docker healtcheck failure would really mean three failures and would take a total of 15 seconds before failing. By default, docker healthchecks will retry 3 times before considering a service unhealhy (with a 30 second interval). Combined with dig retries, this means it would take a total of 9 failed DNS responses before it considers the pihole to be unhealthy. Combining the retry between dig and docker, dig considers it a success if even 1/3 responses are recieved - and docker considers it a success if only 1/3 of those successes are successful. I'm not great at math - and order does make a difference - but I think that means as long as 1/9th of DNS queries are being answered - then docker thinks its healthy. Anyways, long story sort, dig doesn't need to have its own retry logic since docker already has a configuarable retry. I also disable recurse since the goal is to test this specific instance.

Also removed duplicate import statement.

Signed-off-by: Daniel <daniel@developerdan.com>
2020-02-25 08:55:09 -05:00
Adam Hill 096c6b5848
added armel with manual patch for now
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:42:26 -06:00
Adam Hill fd48454649
Revert "initial commit on configdir as volume"
This reverts commit c1fb17a645.

Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-01 12:16:14 -05:00
Martin Buchleitner c1fb17a645 initial commit on configdir as volume
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:12:58 +02:00
Adam Hill 669d91dfe3
No v6 default or validation of the env breaks for non v6 enabled computers
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 23:23:26 -06:00
Adam Hill fca7769b33
remove ServerIP requirement, simpler example commands
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -06:00
Mathieu Hofman 6629aff889 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>
2019-02-06 02:31:33 -08: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 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 1d379d07bd
fix hardcoded s6 arch :( woops
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-16 00:25:48 -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 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 88bec8766a
fixing synology pam
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-30 00:20:50 -05: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 80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 13:31:58 -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 468470b7b5
Added setup_blocklists, other cleanup
* Removed some old switch statements from alpine no longer required
* Limit parallel tests to 2 to help prevent test failure caused by race condition starting parallel tests/containers
* Began introducing a new ENV NO_SETUP to skip the majority of startup script 'setup' functions eventually

Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-29 18:17:54 -05:00
Adam Hill 478b98c503
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-17 19:44:34 -05:00
Adam Hill c17cd37eca
armel build script and dockerfile stuffs
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:43:55 -05:00
Adam Hill e14b742649
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 2018-07-12 11:12:27 -05:00
diginc 1a30cb7e7b ports for QNAP and other expose metadata utilizing things 2018-07-10 21:56:59 -05:00
diginc ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
diginc 60bd77f586 Add in install option for FTLDNS 2018-06-30 17:16:16 -05:00
diginc 45a196d9c4 Move FTL_CMD to dockerfile 2018-04-10 12:33:25 -05:00
diginc c42509541d Merge branch 'Installer_patches' of github.com:diginc/docker-pi-hole into Installer_patches 2018-01-26 21:11:04 -06:00
diginc 91a483614b updates from PR comments 2018-01-26 21:10:56 -06:00
Adam Hill 91481efe48
Merge branch 'dev' into Installer_patches 2018-01-26 19:01:07 -06:00
diginc c9165850c3 move init to a different name to fix s6-overlay issue #158 2018-01-26 19:00:06 -06:00
Gavin Mogan 7664a1252f install procps so pgrep/pkill/etc still exists 2018-01-26 13:46:48 -08:00
Gavin Mogan 47a7419d13 Force non interactive, and only attempt to move systemctl and apt if exist 2018-01-26 13:46:25 -08:00
oscarnyl ad727ec17b
Better compliance with HEALTHCHECK standards 2018-01-11 22:22:06 +01:00
oscarnyl ed9568c5ac
Changed to resolving pi.hole instead of www.google.com 2018-01-11 08:11:31 +01:00
oscarnyl a68629b2cf
Add a healthcheck 2018-01-10 23:05:54 +01:00
diginc 615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc d9fa9b1016 alpine 3.2 startup tests fixed, web still failing 2017-12-11 10:28:15 -06:00
diginc d47442ee6e alpine fixes: list is OK now, ncures for tput requirement 2017-12-08 00:04:01 -06:00
diginc 50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
diginc f22ee44226 Switch to a single template instead of two, jinja logic 2017-10-04 11:05:27 -05:00