docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-03 22:50:55 +02:00
Code Issues Releases Wiki Activity
464 Commits 10 Branches 115 Tags 4.8 MiB
0e7ab463fa
Commit Graph

464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Hill
0e7ab463fa
add finish scripts to restart cleanly 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-19 22:57:05 -05:00
Adam Hill
520669a6b9
merge in dev/master armel goodies 2018-07-19 22:18:34 -05:00
Adam Hill
478b98c503
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-17 19:44:34 -05:00
Adam Hill
20e8843a97
Merge pull request #296 from diginc/armel 
Armv6/Armel architecture image
 2018-07-17 14:29:45 -05:00
Adam Hill
8fd2a02d52
Update .travis.yml 2018-07-17 12:47:01 -05:00
Adam Hill
9a680e95ac
may as well remove OS from Dockerfile.py 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-16 23:59:52 -05:00
Adam Hill
43aa8f45d8
armel readme update 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-16 23:54:52 -05:00
Adam Hill
ec8f441df3
Update the deploy arm to work...better 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-16 23:54:20 -05:00
Adam Hill
c17cd37eca
armel build script and dockerfile stuffs 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-16 23:43:55 -05:00
Adam Hill
e56b5eda00
small tweak to deploy_arm 2018-07-12 11:36:50 -05:00
Adam Hill
bb3885a15b
Update the deploy arm to work...better 2018-07-12 11:34:47 -05:00
Adam Hill
e14b742649
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 2018-07-12 11:12:27 -05:00
Adam Hill
f770df9504
Merge pull request #293 from diginc/more_ports 
More ports
 2018-07-11 14:04:40 -05:00
diginc
89a556f858 add ports to jwilder example 2018-07-10 23:31:04 -05:00
diginc
bd925db871 add ports to basic doco example 2018-07-10 23:25:13 -05:00
diginc
10f948fca0 adding ports to traefik example 2018-07-10 23:22:39 -05:00
diginc
70acf54c2c Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 2018-07-10 23:16:40 -05:00
diginc
1b96d7e760 Merge branch 'dev' of github.com:diginc/docker-pi-hole into more_ports 2018-07-10 23:14:27 -05:00
Adam Hill
3afc1d43ff
Merge pull request #290 from StefanSchoof/SingleDns 
allow no for DNS2
 2018-07-10 23:14:19 -05:00
diginc
6364640d4f readme updates 2018-07-10 23:11:44 -05:00
diginc
1a30cb7e7b ports for QNAP and other expose metadata utilizing things 2018-07-10 21:56:59 -05:00
StefanSchoof
3171feef4c allow no for DNS2 2018-07-06 08:01:41 +00:00
diginc
cd6f2790bd Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2018-07-05 20:51:20 -05:00
diginc
3877a171da fix startup 53 port conflict and test error 2018-07-04 14:11:18 -05:00
diginc
ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
diginc
041ef30d42 Merge remote-tracking branch 'origin/dev' into prerelease 2018-07-02 20:50:51 -05:00
diginc
d45bccf9b4 remove dnsmasq service for new pihole-FTL service 2018-07-02 20:50:31 -05:00
Adam Hill
3a4cf40473
Merge pull request #287 from StefanSchoof/failOnError 
Fail container on error in start.sh
 2018-07-02 14:13:45 -05:00
StefanSchoof
002c8349d2 remove extra set from debugging 2018-07-02 18:18:01 +00:00
StefanSchoof
4ff219b5b8 Fail container on error in start.sh 2018-07-02 11:45:39 +00:00
diginc
60bd77f586 Add in install option for FTLDNS 2018-06-30 17:16:16 -05:00
diginc
3bf7992e52 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2018-06-30 11:38:10 -05:00
Adam Hill
6eabd15cd1
Merge pull request #285 from alefchak/dev 
Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247
 2018-06-23 12:16:48 -05:00
Andrew Lefchak
af1816b7e5 Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247 2018-06-23 00:04:08 -04:00
Adam Hill
8e2889ba56
Merge pull request #270 from nxadm/master 
typo
 2018-05-08 16:36:46 -05:00
Claudio Ramirez
d12a876f8f typo 2018-05-08 21:07:50 +02:00
Adam Hill
a050918a5f
Merge pull request #269 from nxadm/master 
Safe workaround for slow loading pages (scripts that make SSL connections to blocked domains)
 2018-05-08 11:53:31 -05:00
Claudio Ramirez
e10a200d70 fmt 2018-05-04 17:17:53 +02:00
Claudio Ramirez
17b3781dd4 Safe workaround for slow loading pages (scripts that make SSL connections to blocked domains) 2018-05-04 17:16:49 +02:00
Adam Hill
9948388656
Merge pull request #266 from diginc/fix_ipv6_lookup 
fix IP V6 lookup
 2018-04-24 19:44:52 -05:00
Adam Hill
aaad7c8981
Update README.md 2018-04-21 12:47:22 -05:00
Adam Hill
225332b977
fix_ipv6_lookup 
Forgot to add the lookup fix from https://github.com/diginc/docker-pi-hole/issues/199#issuecomment-372462890
 2018-04-21 12:42:13 -05:00
Adam Hill
a51261ae16
Merge pull request #263 from Raqbit/dev 
Fix docker-compose.yml symlink
 2018-04-12 11:30:38 -05:00
Raqbit
6813831883
Fix docker-compose.yml symlink 2018-04-12 17:06:39 +02:00
Adam Hill
3295474f79
Merge pull request #258 from diginc/dev 
Move FTL_CMD to dockerfile
 2018-04-10 12:38:09 -05:00
diginc
45a196d9c4 Move FTL_CMD to dockerfile 2018-04-10 12:33:25 -05:00
Adam Hill
76d6a67d48
Merge pull request #237 from diginc/dev 
Develoment to Master
 2018-04-10 10:36:38 -05:00
Adam Hill
fed2f7f4d3
Update start.sh 2018-04-10 10:07:23 -05:00
Adam Hill
024571b123
Merge pull request #256 from bobsoppe/master 
Update pi-hole core to v3.3.1
 2018-04-10 08:35:44 -05:00
Bob Soppe
b08ce657fc
Update pi-hole core to v3.3.1 2018-04-06 13:59:24 +02:00