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

V2.11.1 update [WIP] #84

Merged
merged 30 commits into from Jan 18, 2017
Merged

V2.11.1 update [WIP] #84

merged 30 commits into from Jan 18, 2017

Commits on Nov 13, 2016

  1. Tini update and arm version 

    * Noticed:
 * tini arm is out!  Go ARM TINI - thanks @krallin
 * tini alpine is behind on 0.9 - grabed latest the same way as debians
 * Redundent run steps between requirements and tini, merged
 * inconsistency in dockerfiles, made consistent
 * I kept writing noticed in front of all these items, used nesting instead
    @diginc
    diginc committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    5301dfc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #73 from diginc/tini_update 

    Tini update and arm version
    @diginc
    diginc committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    19617a7 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. Fixed typo

    @chriscrowley
    chriscrowley committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    988d813 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #77 from chriscrowley/dev 

    Fixed typo
    @diginc
    diginc committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    28d4b77 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2017

  1. DNS is important! Dnsmasq should come up early and not rely on gravit… 

    …y update.
    @mattkenn4545
    mattkenn4545 committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    0d87eae View commit details
    Browse the repository at this point in the history

  2. Use ip route to determine IP

    @mattkenn4545
    mattkenn4545 committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    472b988 View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @mattkenn4545
    mattkenn4545 committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    0477dea View commit details
    Browse the repository at this point in the history

  4. debian images building, alpine WIP

    @diginc
    diginc committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    ef96fbc View commit details
    Browse the repository at this point in the history

  5. latest versions

    @diginc
    diginc committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    2bf5f4c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:diginc/docker-pi-hole into v2.11.1

    @diginc
    diginc committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    2e6ff70 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2017

  1. alpine builds! tests next

    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    dc83502 View commit details
    Browse the repository at this point in the history

  2. resolving alpine+nginx issues

    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    cc1c7a7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #82 from mattkenn4545/feature/dns-is-important 

    Ensure DNS is available early
    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    ce49b19 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    25c3739 View commit details
    Browse the repository at this point in the history

  5. Update docker_run.sh

    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    8d90235 View commit details
    Browse the repository at this point in the history

  6. Update docker_dev.sh

    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    15446df View commit details
    Browse the repository at this point in the history

  7. Merge pull request #83 from mattkenn4545/feature/remove-interface-fro… 

    …m-runs

Use ip route to determine IP
    @diginc
    diginc committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    2a973ed View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2017

  1. various test fixes

    @diginc
    diginc committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    136f43a View commit details
    Browse the repository at this point in the history

  2. disabled real adlists by default

    @diginc
    diginc committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    9f20dcc View commit details
    Browse the repository at this point in the history

  3. Fixed some typos

    @jaltek
    jaltek committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    7a761c5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #87 from jaltek/patch-1 

    Fixed some typos
    @diginc
    diginc committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    b13abe0 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2017

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

    @diginc
    diginc committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    5138e3b View commit details
    Browse the repository at this point in the history

  2. test passing...travis virtual environment is another story

    @diginc
    diginc committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    d528878 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2017

  1. pytest error go away

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    eedea65 View commit details
    Browse the repository at this point in the history

  2. runing as sh breaks tests, override testinfra

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    73c054c View commit details
    Browse the repository at this point in the history

  3. re-do a few things to fix up test/handle updated code

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    5404d61 View commit details
    Browse the repository at this point in the history

  4. move nginx php rule from admin/ only to /

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    4f37f2a View commit details
    Browse the repository at this point in the history

  5. re-enable arm as part of testing

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    14f7654 View commit details
    Browse the repository at this point in the history

  6. remove submodules

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    9dfa187 View commit details
    Browse the repository at this point in the history

  7. remove other submodule related files

    @diginc
    diginc committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    52a0764 View commit details
    Browse the repository at this point in the history