docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-28 12:11:04 +02:00
Code Issues Releases Wiki Activity
501 Commits 10 Branches 115 Tags 4.7 MiB
41b1d04100
Commit Graph

501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
diginc
1c598d3078 adding FTL_CMD for debug 2018-03-01 22:16:38 -06:00
diginc
d83a950a23 update arm version tag 2018-02-22 23:43:07 -06:00
Adam Hill
11ce14d732
Merge pull request #235 from diginc/dev 
v3.3 and other dev branch updates.
 2018-02-22 23:42:17 -06:00
Adam Hill
300b2e6901
Merge pull request #234 from diginc/web_port_references_in_php 
Adding fix for #229
 2018-02-22 23:23:07 -06:00
diginc
53f766876e Adding fix for #229 
* Updates references in /var/www/html to also use WEB_PORT custom HTTP port
* Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history
 2018-02-22 23:11:53 -06:00
Adam Hill
cdcc882d28
Merge pull request #233 from diginc/v3.3 
v3.3
 2018-02-22 11:04:42 -06:00
diginc
f5e83456dd 3.3 tags ahoy 2018-02-21 23:40:27 -06:00
Adam Hill
d5db4f4621
Merge pull request #227 from diginc/use_pihole_checkout 
Use pihole checkout for development checkout
 2018-01-31 10:26:38 -06:00
diginc
492b6f6402 add directory for new FTL socket 2018-01-31 10:07:55 -06:00
diginc
b140aeb79d input yes to continue checkout of dev 2018-01-31 09:25:05 -06:00
Adam Hill
4f93823711
Use pihole checkout for development checkout 
And add FTL
 2018-01-30 13:36:57 -06:00
Adam Hill
1f176da47d
Merge pull request #211 from diginc/Installer_patches 
Update install.sh
 2018-01-27 00:19:26 -06:00
diginc
45f491ff7b use dev branches 2018-01-26 23:58:47 -06:00
diginc
a9b41c7099 make the valid IP checks consistent between IPv4 and IPv6 2018-01-26 21:32:39 -06:00
diginc
94f76397fd remove redundant set -e 2018-01-26 21:25:12 -06:00
diginc
795560f1af remove CUSTOM_INSTALL 2018-01-26 21:14:30 -06:00
diginc
c42509541d Merge branch 'Installer_patches' of github.com:diginc/docker-pi-hole into Installer_patches 2018-01-26 21:11:04 -06:00
diginc
91a483614b updates from PR comments 2018-01-26 21:10:56 -06:00
diginc
e430d5a5e5 switch back to original build 2018-01-26 21:07:25 -06:00
Adam Hill
91481efe48
Merge branch 'dev' into Installer_patches 2018-01-26 19:01:07 -06:00
diginc
c9165850c3 move init to a different name to fix s6-overlay issue #158 2018-01-26 19:00:06 -06:00
diginc
9b7e3998d6 Fix ServerIP v4 validation - error can also be about DNS not being up yet 2018-01-26 18:26:46 -06:00
diginc
39a8802c74 Merge remote-tracking branch 'origin/pr/221' into Installer_patches 2018-01-26 17:36:31 -06:00
Gavin Mogan
b517ecfe6c Updated template releases 2018-01-26 13:47:20 -08:00
Gavin Mogan
7664a1252f install procps so pgrep/pkill/etc still exists 2018-01-26 13:46:48 -08:00
Gavin Mogan
47a7419d13 Force non interactive, and only attempt to move systemctl and apt if exist 2018-01-26 13:46:25 -08:00
Gavin Mogan
75fc2771d1 Switch base images to debian stretch 2018-01-26 13:45:15 -08:00
diginc
26733330d5 Merge branch 'Installer_patches' of github.com:diginc/docker-pi-hole into Installer_patches 2018-01-25 12:47:40 -06:00
diginc
4ab2a96552 remove 127.0.0.1 dns as that is supposed to no longer be an issue I think 2018-01-25 12:46:52 -06:00
diginc
62ddf72d15 exit on config fest failure 2018-01-25 12:45:05 -06:00
diginc
16127f48fc split build out from dockerfile.py to print to buffer and prevent timeout 2018-01-25 12:44:32 -06:00
Adam Hill
22ab253efd
Merge pull request #214 from oscarnyl/patch-2 
Add a healthcheck
 2018-01-15 18:43:53 -06:00
Adam Hill
fd4678de68
Merge pull request #216 from DerFetzer/patch-nethost_blockingpage 
[Untested] Make Lighttpd also bind to localhost when using host network
 2018-01-15 18:43:24 -06:00
DerFetzer
9427357489 Make Lighttpd also bind to localhost when using host network 2018-01-13 15:31:03 +00:00
oscarnyl
ad727ec17b
Better compliance with HEALTHCHECK standards 2018-01-11 22:22:06 +01:00
Adam Hill
b0fac9576e
Update README.md 2018-01-11 09:04:57 -06:00
oscarnyl
ed9568c5ac
Changed to resolving pi.hole instead of www.google.com 2018-01-11 08:11:31 +01:00
Adam Hill
e52572d034
Merge pull request #215 from diginc/master 
Sync master to dev
 2018-01-10 17:15:16 -06:00
oscarnyl
a68629b2cf
Add a healthcheck 2018-01-10 23:05:54 +01:00
Adam Hill
7758a3962c
Merge pull request #213 from diginc/diginc-patch-1 
README updates
 2018-01-10 14:13:12 -06:00
Adam Hill
2cf778f423
Update README.md 2018-01-10 14:12:46 -06:00
Adam Hill
feee2a2356
Update README.md 2018-01-10 14:08:37 -06:00
Adam Hill
84eef29f6d
README updates 
Make the image tag changes more visible
 2018-01-10 14:04:23 -06:00
Adam Hill
d30f024db1
Update install.sh 2018-01-10 10:05:27 -06:00
Adam Hill
ec9f513beb
Update Dockerfile.py 2018-01-10 09:26:55 -06:00
Adam Hill
8a88a67403
Merge pull request #212 from ASuarez27/patch-1 
Update README.md
 2018-01-10 09:03:24 -06:00
ASuarez27
cb3a6e1ac8
Update README.md 
ARM tag was incorrect should be debian_armhf per docker hub tags
 2018-01-08 23:31:14 -05:00
Adam Hill
e58aa2e69e
Update install.sh 2018-01-08 12:53:45 -06:00
Adam Hill
3c96d9e556
May as well bump dev to the new RC 2018-01-08 12:48:12 -06:00
Adam Hill
cd71628992
Update install.sh 
Try out using the updated installer that fixes the version number footer
 2018-01-08 12:38:11 -06:00