1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-02 06:00:56 +02:00
Commit Graph

382 Commits

Author SHA1 Message Date
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
Adam Hill
efb03982e5
Update install.sh 2018-01-08 08:46:30 -06:00
Adam Hill
0614f4275d
Merge pull request #209 from oscarnyl/patch-1
Document changes to how to use ARM images
2018-01-08 08:33:19 -06:00
oscarnyl
813c725636
Mistake 2018-01-07 11:08:19 +01:00
oscarnyl
0eefb76fca
Document changes to how to use ARM images 2018-01-07 11:04:18 +01:00
Adam Hill
33c8b1dd18
Merge pull request #204 from diginc/dev
3.2 To master
2018-01-05 00:07:28 -06:00
diginc
22c9e81803 latest 3.2 2018-01-04 23:51:30 -06:00
Adam Hill
9d49414fe6
Merge pull request #192 from diginc/3.2_upgrade
3.2 alpine removed
2018-01-04 23:37:33 -06:00
diginc
3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc
c4dc16685a shrink 20-start.sh, merge to start.sh 2018-01-03 22:34:31 -06:00
diginc
c4986cfeff space 2018-01-03 21:37:44 -06:00
diginc
130f50c769 merge dev 2018-01-03 21:37:19 -06:00
diginc
b33ea3b77f fixed the tests 2018-01-03 21:35:53 -06:00
diginc
e5a56222a3 Merge branch '3.2_upgrade' of github.com:diginc/docker-pi-hole into 3.2_upgrade 2018-01-03 20:10:42 -06:00
diginc
615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
Adam Hill
b12f91983e
Merge pull request #203 from PromoFaux/tweak/Unsupported
[Untested] Render `pihole -up` inert
2018-01-03 20:06:24 -06:00
Adam Warner
9ed6bf153c
Inject unsupportedFunc into pihole file, replace reference to updatePiholeFunc
Signed-off-by: Adam Warner <adamw@rner.email>
2018-01-01 17:18:29 +00:00
Adam Hill
af616f6afc
Merge pull request #194 from thomasleveil/fail-container-if-start-fails
fail container if s6 20-start.sh scripts fail
2017-12-12 13:35:54 -06:00
Thomas LEVEIL
9318064061 fail container if start.sh fails
stop the container whenever start.sh exits with exit status != 0
2017-12-12 01:01:45 +01:00
diginc
d9fa9b1016 alpine 3.2 startup tests fixed, web still failing 2017-12-11 10:28:15 -06:00