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.

Sign up for GitHub

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

Jump to bottom

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

Commits on Oct 16, 2019

  1. Add new optional env variable DNS_FQDN_REQUIRED 

    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>
    @billimek
    billimek committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    4dffbf0 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2019

  1. Update docker-compose.yml

    @cwilby
    cwilby committed Nov 13, 2019
    Configuration menu
    Copy the full SHA
    e74f8c1 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2019

  1. switching to circleci 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    f23ef9b View commit details
    Browse the repository at this point in the history

  2. command typo 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    18b1f44 View commit details
    Browse the repository at this point in the history

  3. more command fixes 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    0c5468b View commit details
    Browse the repository at this point in the history

  4. forgot requirements.txt 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    c2bca95 View commit details
    Browse the repository at this point in the history

  5. updated pip freeze 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    3d8fed7 View commit details
    Browse the repository at this point in the history

  6. upgrade pip 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Dec 31, 2019
    Configuration menu
    Copy the full SHA
    3a0b1b1 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2020

  1. bump some versions, remove unused 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    8ab895b View commit details
    Browse the repository at this point in the history

  2. remove armel for now 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    8b51f53 View commit details
    Browse the repository at this point in the history

  3. added armel with manual patch for now 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 1, 2020
    Configuration menu
    Copy the full SHA
    096c6b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2020

  1. Merge pull request #550 from pi-hole/circleci 

    Circle CI replacing Travis
    @diginc
    diginc committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    9c76d24 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:diginc/docker-pi-hole into armel 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    9c5393d View commit details
    Browse the repository at this point in the history

  3. re-enable arm

    @diginc
    diginc committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    4ba5005 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #551 from pi-hole/armel 

    Armel
    @diginc
    diginc committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    09eae00 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #524 from billimek/add_dns_fqdn_required 

    Add new optional env variable DNS_FQDN_REQUIRED
    @diginc
    diginc committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    23c4420 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #532 from cwilby/patch-1 

    Fix indenting in docker-compose.yml
    @diginc
    diginc committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    8d5724e View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. CircleCI deployment take 1 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    f34f2ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into deploy-i… 

    …mages-from-ci

Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    5c1503a View commit details
    Browse the repository at this point in the history

  3. missing filter key 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    c3933ab View commit details
    Browse the repository at this point in the history

  4. fix? 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    2f2fb40 View commit details
    Browse the repository at this point in the history

  5. fix? 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    6ddcd3f View commit details
    Browse the repository at this point in the history

  6. fix? 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    1505156 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2020

  1. Remove branch, leaving just tags for wf builds to fix? 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    7d54465 View commit details
    Browse the repository at this point in the history

  2. forget why sudo is needed... 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    fe3c9d2 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. image and namespace are now defaulted but overridable 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    ad6c06d View commit details
    Browse the repository at this point in the history

  2. remove dryrun 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    6995122 View commit details
    Browse the repository at this point in the history

  3. remove tox re-running in deploy script 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    a615d55 View commit details
    Browse the repository at this point in the history

  4. Preparing code for master/tags/latest image 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    ea989a7 View commit details
    Browse the repository at this point in the history

  5. Remove manfiest for now, fix namespace 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    d880f69 View commit details
    Browse the repository at this point in the history

  6. correct todo comment 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    a92ea9c View commit details
    Browse the repository at this point in the history

  7. Quiet things down 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    939d299 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2020

  1. 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
    @diginc
    diginc committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    3765d41 View commit details
    Browse the repository at this point in the history

  2. finally? 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    1265766 View commit details
    Browse the repository at this point in the history

  3. Delete the unecessary 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    aab5310 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. Merge pull request #552 from pi-hole/deploy-images-from-ci 

    CircleCI, CD, Python3, and PipEnv
    @diginc
    diginc committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    8bfe969 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2020

  1. Fix minor spelling mistake 

    Signed-off-by: losuler <losuler@users.noreply.github.com>
    @losuler
    losuler committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    1add81a View commit details
    Browse the repository at this point in the history

  2. Minor spelling mistake in README

    @scott-kirk
    scott-kirk committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    bf0a919 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #565 from scott-kirk/patch-1 

    Minor spelling mistake in README
    @diginc
    diginc committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    f0a9a9f View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2020

  1. Merge pull request #564 from losuler/dev 

    Fix minor spelling mistake
    @diginc
    diginc committed Feb 16, 2020
    Configuration menu
    Copy the full SHA
    0570d26 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. Upgrade v4.3.3 

    Also remove ipv6 from tests, validation fails and breaks tests

Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    c024dcd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #576 from pi-hole/upgrade_v4.3.3 

    Upgrade v4.3.3
    @diginc
    diginc committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    2fdcf19 View commit details
    Browse the repository at this point in the history

  3. update for core 4.3.4 

    Signed-off-by: Adam Warner <me@adamwarner.co.uk>
    @PromoFaux
    PromoFaux committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    6bf15d6 View commit details
    Browse the repository at this point in the history

  4. Did I say 4.3.4? I spoke too soon 

    Signed-off-by: Adam Warner <me@adamwarner.co.uk>
    @PromoFaux
    PromoFaux committed Feb 24, 2020
    Configuration menu
    Copy the full SHA
    c0c7221 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. Merge pull request #578 from pi-hole/release-v4.3.4 

    update for core 4.3.5
    @PromoFaux
    PromoFaux committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    80cea50 View commit details
    Browse the repository at this point in the history

  2. 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>
    @lightswitch05
    lightswitch05 committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    cf6d74a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #579 from lightswitch05/feature/improve-healthchec… 

    …k-responsiveness

Improve healthcheck responsiveness
    @diginc
    diginc committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    d102ba9 View commit details
    Browse the repository at this point in the history

  4. target core version 4.4 

    Signed-off-by: Adam Warner <me@adamwarner.co.uk>
    @PromoFaux
    PromoFaux committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    de7e563 View commit details
    Browse the repository at this point in the history

  5. This should fix the tests 

    Signed-off-by: Adam Warner <me@adamwarner.co.uk>
    @PromoFaux
    PromoFaux committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    ca9bf8c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #581 from pi-hole/v4.4 

    target core version 4.4
    @dschaper
    dschaper committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    76d2578 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2020

  1. Try to deploy latest if the circle build matches latest tag 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    730ee69 View commit details
    Browse the repository at this point in the history

  2. typo 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    3fb82b0 View commit details
    Browse the repository at this point in the history

  3. skip local scope coding, not needed 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    91ab080 View commit details
    Browse the repository at this point in the history

  4. Comment + test latest hub tag 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    d20bde2 View commit details
    Browse the repository at this point in the history

  5. Back to latest tag 

    Signed-off-by: Adam Hill <adam@diginc.us>
    @diginc
    diginc committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    db919a2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #582 from pi-hole/latest_deploy 

    Latest deploy
    @diginc
    diginc committed Feb 26, 2020
    Configuration menu
    Copy the full SHA
    b39a6af View commit details
    Browse the repository at this point in the history