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

290 Commits

Author SHA1 Message Date
Adam Hill 726aef6b4e Update README.md 
switch `create` back to `run -d`
 2017-05-22 12:31:00 -05:00
diginc fbb130c066 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2017-05-22 12:27:21 -05:00
Adam Hill edad7e57f3 Merge pull request #130 from diginc/v3_final_touches 
V3 Final touches for documentation & validating Server IP env vars
 2017-05-19 11:36:53 -05:00
diginc c9b08e8848 documenting and validating the Server IP env vars 2017-05-19 00:36:53 -05:00
Adam Hill dfd060cdd4 Merge pull request #128 from diginc/diginc-patch-2 
Hotfix php-fpm5 binary for old version
 2017-05-15 13:40:57 -05:00
Adam Hill 1fc738c754 Hotfix php-fpm5 binary for old version 
Fixes #127

Sorry, I had to rebuild the newest tag to re-release the readme to docker hub/store and the re-build broke things.
 2017-05-15 13:40:44 -05:00
Adam Hill 753668e8a4 Merge pull request #123 from diginc/s6_experiment 
S6 Init system and v3.* update
 2017-05-13 19:14:25 -05:00
diginc 0e2b77577d adding a alpine compatible list.sh 2017-05-13 18:43:34 -05:00
diginc 2c44470e0f arm updated to match debian 2017-05-13 18:43:01 -05:00
diginc b9095bc123 This commit is too big, but it works 
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
 2017-05-13 17:03:24 -05:00
diginc 8d0ea48ecd 3.0.1 progress 2017-05-09 15:03:03 -05:00
diginc 9f61b87198 debian converted to s6, aline files moved 2017-05-05 21:48:03 -05:00
diginc 20955a41fe alpine converted to s6 2017-05-04 22:37:26 -05:00
Adam Hill ee6a452ca5 Merge pull request #115 from diginc/dev 
2.13.2 upgrade
 2017-03-14 22:33:30 -05:00
diginc b3f100d762 2.13.2 upgrade 2017-03-14 22:09:16 -05:00
Adam Hill f4d1584fa2 Update README.md 
Fix table
 2017-03-04 19:59:45 -06:00
Adam Hill dc54d7f4cd Merge pull request #114 from diginc/dev 
fix up PIHOLE_INTERFACE default
 2017-03-04 17:54:52 -06:00
diginc fec77bf44e Adding README note about these new settings 2017-03-04 17:44:13 -06:00
diginc 67346c2f75 fix up PIHOLE_INTERFACE default 2017-03-04 17:31:09 -06:00
Adam Hill 56b13a3e20 Merge pull request #111 from diginc/dev 
v2.13.1
 2017-03-04 11:07:09 -06:00
diginc d23338407c bump versions, fix shell check failures 2017-03-03 23:13:11 -06:00
Adam Hill e8d5f0c1b4 Update start.sh 
stop printing debug in the docker log down ;)
 2017-02-09 13:01:34 -06:00
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