Adam Hill
eaeef80aed
Update README.md
2016-09-24 00:30:01 -05:00
diginc
3c1861b7bd
2.9.1
2016-09-23 22:42:29 -05:00
diginc
66cb3a7d52
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2016-09-23 21:24:22 -05:00
diginc
8910dadfb2
updating the docker compose examples
2016-09-23 21:24:14 -05:00
Adam Hill
07ca2662fb
Update README.md
2016-09-23 21:17:52 -05:00
Adam Hill
126eea4108
Update README.md
...
Fixup the docker tags section some more
2016-09-23 20:21:21 -05:00
diginc
db5b1c72eb
added ARM tag to docs, update to readme and run script
2016-09-23 20:13:08 -05:00
diginc
2c704addaf
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2016-09-23 18:59:43 -05:00
Adam Hill
c9a28117c9
Update README.md
2016-09-23 08:41:38 -05:00
Adam Hill
cbf293e268
Merge pull request #42 from bgulla/bgulla-patch-1
...
Corrected spelling errors on README
2016-09-09 11:21:36 -05:00
Brandon
658dce811a
Corrected spelling errors on README
2016-09-09 08:48:04 -04:00
Adam Hill
8b1b0614a6
Merge pull request #41 from diginc/dns_tests
...
Adding dns tests
2016-09-07 23:19:16 -05:00
diginc
1e6eda27eb
Persistent dig container running dns tests
...
* Sidekick to pi-hole links and queries DNS
* Lookup the default pi.hole against what was fed in as ServerIP
* Lookup a couple outside popular static DNS servers hostnames too
* a little pre-optimized to persist the dig container since docker start adds half a second (no virtually nothing for digs)
2016-09-07 23:07:38 -05:00
Adam Hill
63017bc511
Merge pull request #40 from diginc/ipv6_tests
...
Ipv6 tests
2016-09-07 21:20:18 -05:00
diginc
e8cb52b23a
ipv6 tests I skipped the other night
2016-09-07 20:39:01 -05:00
diginc
2e8ff99f9a
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2016-09-07 20:36:30 -05:00
Adam Hill
7bf5ba3d7c
Merge pull request #39 from diginc/ipv6_disable_flag
...
quick alpine addition of ipv6 toggle off flag
2016-08-31 22:19:53 -05:00
Adam Hill
e500aba834
Merge pull request #38 from diginc/arm_build
...
docker hub compatible ARM build
2016-08-31 22:19:41 -05:00
diginc
7539d05152
quick alpine addition of ipv6 toggle off flag
2016-08-31 22:10:53 -05:00
diginc
e5a6eca983
bring armhf debian in line with x86
2016-08-31 19:27:22 -05:00
diginc
e58bb2a61e
get rid of sh -c from CMD
2016-08-31 16:31:50 -05:00
diginc
5c91b6fb7c
take path off bash
2016-08-30 20:58:09 -05:00
diginc
0204786139
adding armhf build for testing
2016-08-30 20:07:32 -05:00
name
7dc0250a37
armhf support
2016-08-30 19:48:29 -05:00
Adam Hill
c5c8c1fb1f
Merge pull request #36 from diginc/dev
...
updated to pi-hole 1.9
2016-08-30 19:35:07 -05:00
diginc
fc71aabe68
add the default adlist in case someone mounts in an empty directory
2016-08-30 19:21:17 -05:00
diginc
d1aaae3b5b
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2016-08-30 17:14:04 -05:00
diginc
ced00c74d6
updated to pi-hole 1.9
2016-08-30 17:13:57 -05:00
Adam Hill
c78bb13ca6
Merge pull request #34 from diginc/master
...
Bring dev back in sync with manual master merges
2016-08-28 10:37:54 -05:00
diginc
c341e0316f
adding some missing files from merger mistakes
2016-08-28 02:30:10 -05:00
Adam Hill
b4a929f050
Merge pull request #33 from diginc/dev
...
fixed problem with nginx admin, added test!
2016-08-28 02:06:53 -05:00
diginc
bf50686b9f
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2016-08-28 02:05:50 -05:00
diginc
da44042bd4
fixed problem with nginx admin, added test!
2016-08-28 02:01:48 -05:00
Adam Hill
f24b3741af
Merge pull request #32 from diginc/revert-22-dev
...
Revert "py.test now builds containers, travis py.test"
2016-08-28 01:31:44 -05:00
Adam Hill
0b54098462
Revert "py.test now builds containers, travis py.test"
2016-08-28 01:31:23 -05:00
Adam Hill
a3c22f260a
Merge pull request #22 from diginc/dev
...
py.test now builds containers, travis py.test
2016-08-28 01:30:30 -05:00
Adam Hill
c3de49f154
Merge pull request #31 from diginc/add_missing_indecies
...
Add missing indecies, fix tests
2016-08-28 01:15:39 -05:00
diginc
30fe0a3353
Added more http endpoint tests
...
Forgot to uncomment these, revealed a flaw in the nginx config
nginx now has parity with lighttpd for pages it returns and return codes
2016-08-28 01:13:04 -05:00
diginc
49bae4f0cd
Merge branch 'dev' of github.com:diginc/docker-pi-hole into add_missing_indecies
2016-08-28 00:46:11 -05:00
diginc
3b74e8d3e3
Tests working again, along with persistent tests with an actual running pi-hole container
2016-08-28 00:45:26 -05:00
Adam Hill
c0f0ca119b
Merge pull request #30 from soredake/dev
...
armhf support
2016-08-27 16:26:43 -05:00
name
c6bcc0f87e
armhf support
2016-08-27 21:07:04 +03:00
Adam Hill
952757257a
Merge pull request #29 from diginc/badges_fixed
...
Badges updated
2016-08-25 15:23:11 -05:00
Adam Hill
a145e8d60b
Badges updated
2016-08-25 14:09:02 -05:00
Adam Hill
782fb27559
Merge pull request #27 from diginc/pytest_params
...
Refactor testinfra docker to support parametrize
2016-08-02 23:41:06 -05:00
diginc
d40ee18689
Refactor testinfra docker to support parametrize
...
This accomplishes the same thing as the previous tests, without using testinfra docker's boilerplate example, which had some drawbacks: Adding @parametrize to the previous version didn't allow overriding the pytest.mark docker arg, image:tag, or cmd with a parametrized test containing different expected results associated with either the alpine/debian tag. Isntead it'd run all the parameters against both tags...e.g. nginx and lighttpd test would run agains both alpine and docker when parametizing on the test level.
2016-08-02 23:32:51 -05:00
Adam Hill
a7fae0f5e2
Merge pull request #24 from gitter-badger/gitter-badge
...
Add a Gitter chat badge to README.md
2016-07-22 15:08:31 -05:00
The Gitter Badger
44807d26f3
Add Gitter badge
2016-07-22 19:39:14 +00:00
diginc
e801bfb5ba
probably only need python 2.7
2016-07-18 12:12:25 -05:00
diginc
1e5a8a2762
can I mix docker with python?
2016-07-18 11:17:50 -05:00
