Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to Master to release 4.4 #577

Merged
merged 56 commits into from Feb 26, 2020
Merged

Dev to Master to release 4.4 #577

merged 56 commits into from Feb 26, 2020

Conversation

diginc
Copy link
Collaborator

@diginc diginc commented Feb 24, 2020

After this, we'll tag v4.3.5 against the master branch which should trigger the new circle-ci automated deploy for that docker hub tag.

the 'latest' tag will have to be pushed manually still I believe, I never wrote automation for that.

billimek and others added 30 commits October 16, 2019 00:29
This new optional env variable will allow control over the 'Never
forward non-FQDNs' advanced DNS setting.

Signed-off-by: Jeff Billimek <jeff@billimek.com>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Circle CI replacing Travis
Add new optional env variable DNS_FQDN_REQUIRED
Fix indenting in docker-compose.yml
Signed-off-by: Adam Hill <adam@diginc.us>
…mages-from-ci

Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
scott-kirk and others added 8 commits February 9, 2020 11:19
Minor spelling mistake in README
Fix minor spelling mistake
Also remove ipv6 from tests, validation fails and breaks tests

Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux changed the title Dev to Master to release 4.3.3 Dev to Master to release 4.3.5 Feb 25, 2020
lightswitch05 and others added 2 commits February 25, 2020 08:55
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>
…k-responsiveness

Improve healthcheck responsiveness
@diginc
Copy link
Collaborator Author

diginc commented Feb 25, 2020

One small addition with #579 is getting re-built and will be out on docker hub in the next 10-15m. Please report any feedback on pihole/pihole:dev here before we merge and tag :latest

@diginc diginc mentioned this pull request Feb 25, 2020
PromoFaux and others added 9 commits February 25, 2020 20:57
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
target core version 4.4
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Adam Hill <adam@diginc.us>
@diginc diginc changed the title Dev to Master to release 4.3.5 Dev to Master to release 4.4 Feb 26, 2020
@dschaper
Copy link
Member

:shipit:

@dschaper
Copy link
Member

dschaper commented Feb 26, 2020

Do we need to adjust the required checks?

-travis
+circleci

Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🌮

@PromoFaux
Copy link
Member

Yeah, travis no longer required AFAIK

@diginc diginc merged commit 931aad4 into master Feb 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants