64892423b6
Added 'WEBPASSWORD_FILE' environment variable to enable support for Docker Secrets.
...
If 'WEBPASSWORD' is set, 'WEBPASSWORD_FILE' is ignored. If 'WEBPASSWORD' is empty, and 'WEBPASSWORD_FILE' is set to a valid readable file, then 'WEBPASSWORD' will be set to the contents of 'WEBPASSWORD_FILE'.
Signed-off-by: Daniel <daniel@developerdan.com>
2020-02-26 13:13:20 -05:00
76d2578b77
Merge pull request #581 from pi-hole/v4.4
...
target core version 4.4
2020-02-25 15:39:19 -08:00
ca9bf8ce5c
This should fix the tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-25 22:50:38 +00:00
de7e563ad2
target core version 4.4
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-25 20:57:20 +00:00
d102ba94e5
Merge pull request #579 from lightswitch05/feature/improve-healthcheck-responsiveness
...
Improve healthcheck responsiveness
2020-02-25 09:24:26 -06:00
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
80cea505c4
Merge pull request #578 from pi-hole/release-v4.3.4
...
update for core 4.3.5
2020-02-25 10:22:59 +00:00
c0c72219a9
Did I say 4.3.4? I spoke too soon
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-24 20:18:27 +00:00
6bf15d6577
update for core 4.3.4
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-24 18:05:02 +00:00
2fdcf19223
Merge pull request #576 from pi-hole/upgrade_v4.3.3
...
Upgrade v4.3.3
2020-02-24 09:11:53 -06:00
c024dcd8d9
Upgrade v4.3.3
...
Also remove ipv6 from tests, validation fails and breaks tests
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-23 22:33:42 -06:00
0570d264ed
Merge pull request #564 from losuler/dev
...
Fix minor spelling mistake
2020-02-16 13:01:36 -06:00
f0a9a9fb04
Merge pull request #565 from scott-kirk/patch-1
...
Minor spelling mistake in README
2020-02-09 12:46:43 -06:00
bf0a9190c8
Minor spelling mistake in README
2020-02-09 11:19:04 -05:00
1add81a1ce
Fix minor spelling mistake
...
Signed-off-by: losuler <losuler@users.noreply.github.com>
2020-02-09 17:27:48 +11:00
8bfe96968d
Merge pull request #552 from pi-hole/deploy-images-from-ci
...
CircleCI, CD, Python3, and PipEnv
2020-02-03 15:37:14 -06:00
aab53102db
Delete the unecessary
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-30 20:46:12 -06:00
1265766b3a
finally?
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-30 20:28:06 -06:00
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
939d2992f1
Quiet things down
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:47:04 -06:00
a92ea9c386
correct todo comment
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:41:11 -06:00
d880f69836
Remove manfiest for now, fix namespace
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:39:57 -06:00
ea989a78c4
Preparing code for master/tags/latest image
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:21:36 -06:00
a615d551a5
remove tox re-running in deploy script
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-14 00:11:09 -06:00
6995122edd
remove dryrun
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-13 23:52:40 -06:00
ad6c06d075
image and namespace are now defaulted but overridable
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-13 23:47:40 -06:00
fe3c9d22d5
forget why sudo is needed...
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-04 12:24:26 -06:00
7d54465eb0
Remove branch, leaving just tags for wf builds to fix?
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-04 12:03:49 -06:00
1505156bfa
fix?
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-03 00:01:35 -06:00
6ddcd3f716
fix?
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:58:14 -06:00
2f2fb40c56
fix?
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:50:56 -06:00
c3933ab7ae
missing filter key
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:45:50 -06:00
5c1503aff5
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into deploy-images-from-ci
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:42:14 -06:00
f34f2ce857
CircleCI deployment take 1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-02 23:42:04 -06:00
8d5724e70e
Merge pull request #532 from cwilby/patch-1
...
Fix indenting in docker-compose.yml
2020-01-02 13:45:02 -06:00
23c4420630
Merge pull request #524 from billimek/add_dns_fqdn_required
...
Add new optional env variable DNS_FQDN_REQUIRED
2020-01-02 13:38:30 -06:00
09eae003cf
Merge pull request #551 from pi-hole/armel
...
Armel
2020-01-02 13:37:47 -06:00
4ba50052a5
re-enable arm
2020-01-01 21:33:38 -06:00
9c5393dfa0
Merge branch 'dev' of github.com:diginc/docker-pi-hole into armel
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-01 21:25:53 -06:00
9c76d246f6
Merge pull request #550 from pi-hole/circleci
...
Circle CI replacing Travis
2020-01-01 21:25:09 -06:00
096c6b5848
added armel with manual patch for now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:42:26 -06:00
8b51f53bfe
remove armel for now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:41:31 -06:00
8ab895b38a
bump some versions, remove unused
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 18:02:22 -06:00
3a0b1b197c
upgrade pip
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 17:48:09 -06:00
3d8fed70e7
updated pip freeze
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 17:45:35 -06:00
c2bca952a4
forgot requirements.txt
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 17:42:08 -06:00
0c5468ba29
more command fixes
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 16:57:37 -06:00
18b1f446ab
command typo
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 16:56:08 -06:00
f23ef9b293
switching to circleci
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 16:53:50 -06:00
e74f8c12e4
Update docker-compose.yml
2019-11-12 16:58:04 -08:00
Daniel
Dan Schaper
Adam Warner
Adam Hill
Scott Kirkpatrick
losuler
Cameron Wilby