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

Release/v4.0 #300

Merged
merged 48 commits into from
Aug 6, 2018
Merged

Release/v4.0 #300

merged 48 commits into from
Aug 6, 2018

Commits on Jun 30, 2018

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

    @diginc
    diginc committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    3bf7992 View commit details
    Browse the repository at this point in the history

  2. Add in install option for FTLDNS

    @diginc
    diginc committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    60bd77f View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. remove dnsmasq service for new pihole-FTL service

    @diginc
    diginc committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    d45bccf View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into prerelease

    @diginc
    diginc committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    041ef30 View commit details
    Browse the repository at this point in the history

  3. Fixes to the startup, services, and dnsmasq references

    @diginc
    diginc committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    ad6b4be View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. fix startup 53 port conflict and test error

    @diginc
    diginc committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    3877a17 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

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

    @diginc
    diginc committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    70acf54 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

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

    @diginc
    diginc committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    e14b742 View commit details
    Browse the repository at this point in the history

  2. Update the deploy arm to work...better

    @diginc
    diginc committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    bb3885a View commit details
    Browse the repository at this point in the history

  3. small tweak to deploy_arm

    @diginc
    diginc committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    e56b5ed View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

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

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

Commits on Jul 20, 2018

  1. merge in dev/master armel goodies

    @diginc
    diginc committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    520669a View commit details
    Browse the repository at this point in the history

  2. add finish scripts to restart cleanly 

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

Commits on Jul 29, 2018

  1. 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>
    @diginc
    diginc committed Jul 29, 2018
    Configuration menu
    Copy the full SHA
    468470b View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2018

  1. switch branch to release/v4.0 

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

Commits on Aug 2, 2018

  1. Checkout to the new release branch not old FTLDNS one 

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

Commits on Aug 3, 2018

  1. Add fixes for config permissions, deprection notice

    @diginc
    diginc committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    e7ae12a View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2018

  1. note about armel 

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

  2. stop using pihole init.d stop, may be going away 

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

  3. A bunch of name changes 

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

  4. more /diginc/ references updated 

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

  5. missed one file 

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

  6. more readme old debian tags 

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

  7. Test image name updates, passing locally. reorg Dockerfile to build f… 

    …ast, starting on new deploy

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

  8. updated script for new names 

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

  9. readme updates 

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

  10. multiarch reference removed 

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

  11. travis link fix 

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

  12. Typo, "Pi-hole" consistantly 

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

  13. image, theirs=ours, dockers=docker containers 

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

  14. image to html the same as main repo's 

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

  15. image to top, links fix, better writing for 443 sinkhole 

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

  16. change password interactively to avoid leaving bash history 

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

  17. Better writing for second half of 443 sinkhold section 

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

  18. Merge pull request #302 from pi-hole/repo_naming_changes 

    Repo naming changes
    @diginc
    diginc authored Aug 4, 2018
    Configuration menu
    Copy the full SHA
    4dc3c7e View commit details
    Browse the repository at this point in the history

  19. Fix web password corruption 

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

  20. quick fix to web password regression, probably not greatest fix but i… 

    …t works

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

Commits on Aug 5, 2018

  1. Updated deploy script (still needs work), fixed dead link 

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

  2. remove multiarch and comments from readme (dockerhub does not high co… 

    …mments)

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

  3. Adding helpful comment for copy paste to Dockerhub/Store 

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

  4. Merge branch 'master' of github.com:diginc/docker-pi-hole into releas… 

    …e/v4.0
    @diginc
    diginc committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    b7e813c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into release/v4.0

    @diginc
    diginc authored Aug 5, 2018
    Configuration menu
    Copy the full SHA
    7cbb8d1 View commit details
    Browse the repository at this point in the history

  6. Use new v4 prod tags, scrub old dev install code 

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

  7. Merge branch 'release/v4.0' of github.com:diginc/docker-pi-hole into … 

    …release/v4.0
    @diginc
    diginc committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    b5c7ab0 View commit details
    Browse the repository at this point in the history

  8. disable armel(broken in 4.0 for now)

    @diginc
    diginc committed Aug 5, 2018
    Configuration menu
    Copy the full SHA
    cb0fffa View commit details
    Browse the repository at this point in the history

  9. start of fixing race condition by not having test+s6 both run /start.sh 

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

  10. grab version on startup for web footer. 2 tests stablized 

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

Commits on Aug 6, 2018

  1. Fix regex writing for web, fix deploying latest 

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