b5c7ab0522
Merge branch 'release/v4.0' of github.com:diginc/docker-pi-hole into release/v4.0
2018-08-05 13:14:45 -05:00
22ea5e77b4
Use new v4 prod tags, scrub old dev install code
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 13:14:00 -05:00
7cbb8d1434
Merge branch 'master' into release/v4.0
2018-08-05 12:55:20 -05:00
b7e813cadc
Merge branch 'master' of github.com:diginc/docker-pi-hole into release/v4.0
2018-08-05 12:54:57 -05:00
797a9213e4
Adding helpful comment for copy paste to Dockerhub/Store
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 19:46:12 -05:00
c56385ad49
remove multiarch and comments from readme (dockerhub does not high comments)
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 19:43:05 -05:00
5cc28d769a
Updated deploy script (still needs work), fixed dead link
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 19:33:45 -05:00
20e8ce208c
quick fix to web password regression, probably not greatest fix but it works
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 16:19:11 -05:00
119999be71
Fix web password corruption
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:58:05 -05:00
4dc3c7e2dc
Merge pull request #302 from pi-hole/repo_naming_changes
...
Repo naming changes
2018-08-04 15:38:37 -05:00
5ee2cc947c
Better writing for second half of 443 sinkhold section
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:17:06 -05:00
1c063a6619
change password interactively to avoid leaving bash history
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:08:24 -05:00
df63b3ee12
image to top, links fix, better writing for 443 sinkhole
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:04:35 -05:00
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
c8d7abed1b
image, theirs=ours, dockers=docker containers
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:52:08 -05:00
a257be134d
Typo, "Pi-hole" consistantly
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:43:56 -05:00
7b06920cd0
travis link fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:36:34 -05:00
1f49971046
multiarch reference removed
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:34:26 -05:00
a4296416b0
readme updates
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:28:33 -05:00
65ecba6705
updated script for new names
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 14:24:44 -05:00
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
6e15abd002
more readme old debian tags
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 12:06:51 -05:00
5b1e992d66
missed one file
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:53:12 -05:00
805c5ccdb7
more /diginc/ references updated
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:44:24 -05:00
73f05e6d35
A bunch of name changes
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:40:37 -05:00
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
ae16d39016
note about armel
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 10:07:10 -05:00
e7ae12a94c
Add fixes for config permissions, deprection notice
2018-08-02 22:50:01 -05:00
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
c7d775a82a
switch branch to release/v4.0
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-30 22:29:36 -05:00
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
0e7ab463fa
add finish scripts to restart cleanly
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-19 22:57:05 -05:00
520669a6b9
merge in dev/master armel goodies
2018-07-19 22:18:34 -05:00
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
4bd9def800
Merge pull request #288 from diginc/dev
...
Release dev fixes to production.
2018-07-17 18:19:40 -05:00
20e8843a97
Merge pull request #296 from diginc/armel
...
Armv6/Armel architecture image
2018-07-17 14:29:45 -05:00
8fd2a02d52
Update .travis.yml
2018-07-17 12:47:01 -05:00
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
43aa8f45d8
armel readme update
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:54:52 -05:00
ec8f441df3
Update the deploy arm to work...better
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:54:20 -05:00
c17cd37eca
armel build script and dockerfile stuffs
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:43:55 -05:00
e56b5eda00
small tweak to deploy_arm
2018-07-12 11:36:50 -05:00
bb3885a15b
Update the deploy arm to work...better
2018-07-12 11:34:47 -05:00
e14b742649
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
2018-07-12 11:12:27 -05:00
f770df9504
Merge pull request #293 from diginc/more_ports
...
More ports
2018-07-11 14:04:40 -05:00
89a556f858
add ports to jwilder example
2018-07-10 23:31:04 -05:00
bd925db871
add ports to basic doco example
2018-07-10 23:25:13 -05:00
10f948fca0
adding ports to traefik example
2018-07-10 23:22:39 -05:00
70acf54c2c
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
2018-07-10 23:16:40 -05:00
1b96d7e760
Merge branch 'dev' of github.com:diginc/docker-pi-hole into more_ports
2018-07-10 23:14:27 -05:00
Adam Hill