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

285 Commits

Author SHA1 Message Date
diginc 70988c2f10 tox + sped up parallel pytest 2017-10-05 14:24:30 -05:00
Adam Hill c0c9114f37 Merge pull request #167 from diginc/DockerfileGeneration 
Dockerfile generation with template
 2017-10-05 12:51:35 -05:00
diginc d98837c828 expand most tests to run for all os arch combos 2017-10-05 11:59:19 -05:00
diginc f22ee44226 Switch to a single template instead of two, jinja logic 2017-10-04 11:05:27 -05:00
diginc 3c6db584d7 split out test builds for each arch to help avoid travis timeout 2017-10-02 23:46:42 -05:00
diginc 51bebbe4af try setting up qemu for travis build machine to fix red 2017-10-02 23:14:03 -05:00
diginc 18997fe9f6 templated dockerfiles building used by tests 
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
 2017-10-02 22:52:02 -05:00
diginc db443aa0dc alpine template variables swapped in 2017-10-01 23:33:15 -05:00
diginc ba86bc53d8 Generate dockerfiles for easier updating, all the variants for debian+alpine, updated s6 2017-10-01 23:25:57 -05:00
Adam Hill 1baf6a5258 Merge pull request #166 from klud1/master 
Alpine based images for ARM*
 2017-10-01 14:48:13 -05:00
Mauricio Ugaz 397ad13599
Alpine based images for ARM* 2017-10-01 10:46:41 -03:00
diginc fc71c30dde Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2017-09-05 22:03:55 -05:00
Adam Hill 11a49ca9e6 Merge pull request #160 from zpartal/master 
Fix passing in DNS1 and DNS2 env vars to setup_dnsmasq
 2017-09-05 22:02:50 -05:00
Adam Hill 18d9e69621 Merge pull request #161 from Lyrex/dev 
Fix "wrong domain bug" on block page
 2017-09-05 21:56:50 -05:00
Lyrex aee35549f5 Reduce search pattern size and complexity 2017-09-05 20:52:58 +02:00
Lyrex aac93cd6f8 Fix hostname bug on block page 2017-09-05 20:35:49 +02:00
= 5d0706613d Fix passing in DNS1 and DNS2 env vars to setup_dnsmasq 2017-09-03 01:57:52 -05:00
Adam Hill e037ca86af Merge pull request #159 from diginc/dev 
Release updated dev version to master
 2017-09-01 20:14:27 -05:00
Adam Hill 4fee2d3d0c Merge pull request #157 from gregorycerna/master 
update pi-hole to 3.1.4 and FTL to 2.10
 2017-08-09 15:14:01 -05:00
gregory 8cb0cd9481 update pi-hole to 3.1.4 and FTL to 2.10 2017-08-09 14:33:41 -05:00
Adam Hill 5d2ee76afe Merge pull request #155 from FrozenDragoon/dev 
Bind lighttpd to only one IP when using "--net=host"
 2017-07-27 10:24:10 -05:00
FrozenDragoon ead9ec564d Fix extra / , and make if and grep checking consistent 2017-07-26 16:50:23 -05:00
FrozenDragoon 11ec647a18 Fix indentation 2017-07-26 16:35:16 -05:00
FrozenDragoon 3b91e17316 Move function to bash_functions, keep start.sh clean 2017-07-26 14:36:32 -05:00
BuildTools 685cfe751a If running in debian image, make Lighttpd only listen on one IP. See diginc/docker-pi-hole#154 2017-07-26 14:06:31 -05:00
Adam Hill 844df6a016 Merge pull request #149 from diginc/dev 
3.1 release
 2017-06-24 16:06:01 -05:00
diginc 038930959f new version 2017-06-23 23:42:01 -05:00
Adam Hill c40d23246a Update README.md 2017-06-23 11:27:58 -05:00
Adam Hill 3da27648d5 Merge pull request #140 from diginc/dev 
Dev fixes for ARM & Alpine
 2017-05-29 14:35:21 -05:00
diginc 48d5f101a9 missing space 2017-05-29 14:02:28 -05:00
diginc e290d969d8 updating docs 2017-05-29 13:59:03 -05:00
Adam Hill 00263e5741 Merge pull request #138 from middleagedman/dev 
Documentation updates
 2017-05-29 13:40:54 -05:00
diginc 294968ae45 FTL fix #139: adding symlink for ld-linux.so to armhf lib 2017-05-29 13:40:01 -05:00
Tom Moore e2879d4331 Added systemd service file and included instructions on it's use 2017-05-24 10:16:56 -04:00
Tom Moore 9705a9c8cf Fixed missing " 2017-05-24 10:09:14 -04:00
Tom Moore cfba2f1ceb Updated the docs to use the predefined env variables, and to keep in line with later path recommendations 2017-05-24 10:07:49 -04:00
diginc 2a5b6de029 see if this fixes alpine 2017-05-24 08:06:43 -05:00
Adam Hill fcb62ee26b Merge pull request #134 from diginc/dev 
FTL v2.7.3
 2017-05-23 13:21:07 -05:00
diginc 78cb0c4a57 reseed original config if using volume 2017-05-23 09:22:16 -05:00
Adam Hill a9bc07f1c0 Update README.md 2017-05-23 08:49:29 -05:00
Adam Hill fe5f374289 Update README.md 
typo
 2017-05-23 08:47:39 -05:00
diginc c3c94b8955 a bunch of documentation tweaks 2017-05-22 23:39:56 -05:00
diginc 13b7914812 FTL v2.7.3 2017-05-22 18:06:37 -05:00
Adam Hill 4f8d7f4720 Merge pull request #133 from diginc/dev 
Development version of v3.0.1 release
 2017-05-22 17:34:03 -05:00
Adam Hill 42ab9f9a7d Update docker_run.sh 
Switch `create` back to `run -d`
 2017-05-22 12:32:15 -05:00
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