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

482 Commits

Author SHA1 Message Date
Adam Hill
3c135774d3
image to html the same as main repo's
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:55:08 -05:00
Adam Hill
c8d7abed1b
image, theirs=ours, dockers=docker containers
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:52:08 -05:00
Adam Hill
a257be134d
Typo, "Pi-hole" consistantly
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:43:56 -05:00
Adam Hill
7b06920cd0
travis link fix
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:36:34 -05:00
Adam Hill
1f49971046
multiarch reference removed
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:34:26 -05:00
Adam Hill
a4296416b0
readme updates
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:28:33 -05:00
Adam Hill
65ecba6705
updated script for new names
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:24:44 -05:00
Adam Hill
80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 13:31:58 -05:00
Adam Hill
6e15abd002
more readme old debian tags
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 12:06:51 -05:00
Adam Hill
5b1e992d66
missed one file
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:53:12 -05:00
Adam Hill
805c5ccdb7
more /diginc/ references updated
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:44:24 -05:00
Adam Hill
73f05e6d35
A bunch of name changes
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:40:37 -05:00
Adam Hill
187c1d3f29
stop using pihole init.d stop, may be going away
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 10:30:51 -05:00
Adam Hill
ae16d39016
note about armel
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 10:07:10 -05:00
Adam Hill
e7ae12a94c
Add fixes for config permissions, deprection notice 2018-08-02 22:50:01 -05:00
Adam Hill
e7f5433d98
Checkout to the new release branch not old FTLDNS one
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-01 19:15:35 -05:00
Adam Hill
c7d775a82a
switch branch to release/v4.0
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-30 22:29:36 -05:00
Adam Hill
468470b7b5
Added setup_blocklists, other cleanup
* Removed some old switch statements from alpine no longer required
* Limit parallel tests to 2 to help prevent test failure caused by race condition starting parallel tests/containers
* Began introducing a new ENV NO_SETUP to skip the majority of startup script 'setup' functions eventually

Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-29 18:17:54 -05:00
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