Commit Graph

34 Commits

Author SHA1 Message Date
Daniel 6939ea024f
Simplify Dockerfile configuration.
* Simplify docker builds by consolidating all arch's into a single Dockerfile and using ARGS for various differences
* Introduce docker-compose based builds (build.yml) for simple management of the various args differences

Signed-off-by: Daniel <daniel@developerdan.com>
2020-05-15 16:06:48 -04:00
Adam Hill d444a11ad1 Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into beta-v5.0 2020-05-10 11:58:22 -05:00
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 4c4e9c3bc9 Beta v5.0
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-03 23:39:03 -06:00
Adam Hill 3765d41b5c Update way too much
- Tox py3.7 + pipenv
- Python3 Dockerfile.py
- Dockerfile.py tags remote instead of just local image names now
- Circle.sh instead of in-line circle.yml script breakout
- probably other stuff I forgot
- Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers.
- Rename aarch64 to arm64 to reduce custom map
2020-01-30 20:26:57 -06: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 17f87be607
wait for returncode
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-19 00:07:56 -05:00
Adam Hill 658df9e905
comment cleanup
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-17 23:14:12 -05:00
Adam Hill aa31e6baf6
Dockerfile.py now live prints docker build output
Signed-off-by: Adam Hill <adam@diginc.us>
2019-09-17 23:06:31 -05:00
cclauss 6987b36981 Use print() function in both Python 2 and Python 3
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
2019-08-31 22:07:13 +02:00
Adam Hill 02e3ead7eb
Docker Pi-hole v4.3
Signed-off-by: Adam Hill <adam@diginc.us>
2019-04-11 22:17:26 -05: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 d0b35cec63
4.1.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -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
Adam Hill cf551180e7
explicitely pin debian slim image (no change, just an alias for old image)
Signed-off-by: Adam Hill <adam@diginc.us>
2018-09-24 21:25:00 -05: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 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 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 9a680e95ac
may as well remove OS from Dockerfile.py
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:59:52 -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
diginc 60bd77f586 Add in install option for FTLDNS 2018-06-30 17:16:16 -05:00
Gavin Mogan 75fc2771d1 Switch base images to debian stretch 2018-01-26 13:45:15 -08:00
diginc 3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc 615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc d47442ee6e alpine fixes: list is OK now, ncures for tput requirement 2017-12-08 00:04:01 -06:00
diginc 6ff1d21f7b New s6 version, remove old list.sh 2017-12-07 19:57:09 -06:00
diginc 50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
diginc bcfcc85ef3 removed impossible testing combos 2017-11-05 21:30:07 -06:00
diginc fe34280393 new customizable Dockerfile.py and travis matrix 2017-10-18 21:41:23 -05:00
diginc 7c85ac8d32 Split build out from tests to ensure it runs first 2017-10-16 23:45:39 -05:00