docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
868 Commits 10 Branches 114 Tags 4.7 MiB
Commit Graph

868 Commits

Author SHA1 Message Date
Adam Hill 28b57e9c01 Merge pull request #106 from diginc/README 
Web Password and updated documentation
 2017-02-09 11:10:10 -06:00
Adam Hill 66314c86b4 Update README.md 
Add a note about customizing port 80 to another port.
 2017-02-09 10:52:41 -06:00
Adam Hill f84a56b712 Update README.md 
Spellcheck
 2017-02-08 23:33:02 -06:00
diginc 4a230a5fe5 uppercase WEBPASSWORD var 2017-02-08 22:51:10 -06:00
diginc 907d36ae9b Add web password support 2017-02-08 22:46:46 -06:00
diginc 0eb410ae31 Documentation and run cmd updates 2017-02-03 00:05:34 -06:00
Adam Hill 11e952aa9f Merge pull request #104 from diginc/dev 
switch how we pin to fix our web interface version
 2017-02-01 17:38:11 -06:00
diginc d950e8b47c switch how we pin to fix our web interface version 2017-02-01 16:37:53 -06:00
Adam Hill eb8398cbd3 Merge pull request #103 from diginc/dev 
v2.12.1
 2017-02-01 15:34:26 -06:00
diginc c12c1a1c10 2.12.1 2017-02-01 15:31:53 -06:00
Adam Hill f14f0cdaf9 Merge pull request #102 from diginc/dev 
version 1.12
 2017-02-01 15:26:02 -06:00
diginc a1a30c8439 remove php.ini full copy for extension addition 2017-02-01 12:49:46 -06:00
diginc 5438ee3800 Merge branch 'dev' of github.com:diginc/docker-pi-hole into HEAD 2017-01-31 21:04:55 -06:00
Adam Hill 8464bc64b5 Add distro_check function call 
logic that used to be at top of pi-hole's install is now in distro_check()
 2017-01-31 16:01:46 -06:00
diginc 9250e3570e v2.12 breaks the build, oh well this is dev branch 2017-01-31 00:00:02 -06:00
diginc 4259fa7f54 adding reproducible v1.11.2 build before 1.12 upgrade 2017-01-30 23:58:48 -06:00
Tom Moore 2cb217a126 Added functionality to support new Pi-Hole teleporter admin function (alpine-only) (exporting of lists) 2017-01-30 23:54:49 -05:00
Adam Hill 5b7a9f3f12 Merge pull request #96 from diginc/dev 
Release dev to master
 2017-01-21 20:44:29 -06:00
diginc 4ceae13015 shellcheck fix 2017-01-21 20:12:37 -06:00
Adam Hill bdc439f84c Merge pull request #95 from wtreur/dev 
Ensured setupVars.conf is always present when changing settings from start.sh
 2017-01-21 18:33:46 -06:00
Walter Treur 746399ce4b Ensured setupVars.conf is always present when changing settings from start.sh 2017-01-21 16:03:08 -05:00
diginc 4f1fb5ec01 Revert "re-enable arm as part of testing". 
This reverts commit 14f7654549.

docker cloud runs a build for arm now and travis-ci times out on arm building through qemu.
 2017-01-18 20:30:10 -06:00
Adam Hill 35a282b45d Merge pull request #91 from diginc/master 
update dev with latest master release code
 2017-01-18 20:25:12 -06:00
Adam Hill 69e5164215 Merge pull request #89 from soredake/links 
links update
 2017-01-18 09:57:16 -06:00
Adam Hill 2a2530d5f3 Merge pull request #84 from diginc/v2.11.1 
V2.11.1+ update - from github official repo & installer rather than sub modules.
 2017-01-18 08:52:59 -06:00
diginc 52a0764d57 remove other submodule related files 2017-01-17 23:17:45 -06:00
diginc 9dfa187ae2 remove submodules 2017-01-17 23:16:11 -06:00
diginc 14f7654549 re-enable arm as part of testing 2017-01-17 23:13:24 -06:00
diginc 4f37f2a130 move nginx php rule from admin/ only to / 2017-01-17 23:12:24 -06:00
diginc 5404d6124f re-do a few things to fix up test/handle updated code 2017-01-17 22:49:42 -06:00
diginc 73c054cbc5 runing as sh breaks tests, override testinfra 2017-01-17 22:48:59 -06:00
diginc eedea6526a pytest error go away 2017-01-17 22:48:25 -06:00
soredake aa94d74aab links update 2017-01-13 23:51:33 +02:00
diginc d528878bac test passing...travis virtual environment is another story 2017-01-11 20:12:56 -06:00
diginc 5138e3ba3b Merge branch 'v2.11.1' of github.com:diginc/docker-pi-hole into v2.11.1 2017-01-11 19:38:45 -06:00
Adam Hill b13abe038e Merge pull request #87 from jaltek/patch-1 
Fixed some typos
 2017-01-11 10:03:22 -06:00
Jan 7a761c5dcb Fixed some typos 2017-01-11 16:15:52 +01:00
diginc 9f20dcc708 disabled real adlists by default 2017-01-10 22:58:27 -06:00
diginc 136f43a995 various test fixes 2017-01-10 20:38:42 -06:00
Adam Hill 2a973ed0e1 Merge pull request #83 from mattkenn4545/feature/remove-interface-from-runs 
Use ip route to determine IP
 2017-01-09 12:09:43 -06:00
Adam Hill 15446df061 Update docker_dev.sh 2017-01-09 12:05:40 -06:00
Adam Hill 8d90235580 Update docker_run.sh 2017-01-09 12:04:32 -06:00
Adam Hill 25c3739a0c Update README.md 2017-01-09 12:03:01 -06:00
Adam Hill ce49b19ade Merge pull request #82 from mattkenn4545/feature/dns-is-important 
Ensure DNS is available early
 2017-01-09 10:42:38 -06:00
diginc cc1c7a745d resolving alpine+nginx issues 2017-01-08 23:43:12 -06:00
diginc dc83502ed1 alpine builds! tests next 2017-01-08 19:13:25 -06:00
diginc 2e6ff703a2 Merge branch 'master' of github.com:diginc/docker-pi-hole into v2.11.1 2017-01-08 11:13:51 -06:00
diginc 2bf5f4ce00 latest versions 2017-01-08 10:54:18 -06:00
diginc ef96fbc809 debian images building, alpine WIP 2017-01-08 10:42:39 -06:00
Matthew Kennedy 0477dea085 Fix tests 2017-01-07 22:36:31 -07:00