e500aba834
Merge pull request #38 from diginc/arm_build
...
docker hub compatible ARM build
2016-08-31 22:19:41 -05:00
7539d05152
quick alpine addition of ipv6 toggle off flag
2016-08-31 22:10:53 -05:00
e5a6eca983
bring armhf debian in line with x86
2016-08-31 19:27:22 -05:00
e58bb2a61e
get rid of sh -c from CMD
2016-08-31 16:31:50 -05:00
5c91b6fb7c
take path off bash
2016-08-30 20:58:09 -05:00
0204786139
adding armhf build for testing
2016-08-30 20:07:32 -05:00
7dc0250a37
armhf support
2016-08-30 19:48:29 -05:00
c5c8c1fb1f
Merge pull request #36 from diginc/dev
...
updated to pi-hole 1.9
2016-08-30 19:35:07 -05:00
fc71aabe68
add the default adlist in case someone mounts in an empty directory
2016-08-30 19:21:17 -05:00
d1aaae3b5b
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2016-08-30 17:14:04 -05:00
ced00c74d6
updated to pi-hole 1.9
2016-08-30 17:13:57 -05:00
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
c341e0316f
adding some missing files from merger mistakes
2016-08-28 02:30:10 -05:00
b4a929f050
Merge pull request #33 from diginc/dev
...
fixed problem with nginx admin, added test!
2016-08-28 02:06:53 -05:00
bf50686b9f
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2016-08-28 02:05:50 -05:00
da44042bd4
fixed problem with nginx admin, added test!
2016-08-28 02:01:48 -05:00
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
0b54098462
Revert "py.test now builds containers, travis py.test"
2016-08-28 01:31:23 -05:00
a3c22f260a
Merge pull request #22 from diginc/dev
...
py.test now builds containers, travis py.test
2016-08-28 01:30:30 -05:00
c3de49f154
Merge pull request #31 from diginc/add_missing_indecies
...
Add missing indecies, fix tests
2016-08-28 01:15:39 -05:00
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
49bae4f0cd
Merge branch 'dev' of github.com:diginc/docker-pi-hole into add_missing_indecies
2016-08-28 00:46:11 -05:00
3b74e8d3e3
Tests working again, along with persistent tests with an actual running pi-hole container
2016-08-28 00:45:26 -05:00
c0f0ca119b
Merge pull request #30 from soredake/dev
...
armhf support
2016-08-27 16:26:43 -05:00
c6bcc0f87e
armhf support
2016-08-27 21:07:04 +03:00
952757257a
Merge pull request #29 from diginc/badges_fixed
...
Badges updated
2016-08-25 15:23:11 -05:00
a145e8d60b
Badges updated
2016-08-25 14:09:02 -05:00
782fb27559
Merge pull request #27 from diginc/pytest_params
...
Refactor testinfra docker to support parametrize
2016-08-02 23:41:06 -05:00
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
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
44807d26f3
Add Gitter badge
2016-07-22 19:39:14 +00:00
e801bfb5ba
probably only need python 2.7
2016-07-18 12:12:25 -05:00
1e5a8a2762
can I mix docker with python?
2016-07-18 11:17:50 -05:00
b41dd1bf8c
py.test now builds containers, travis py.test
...
* Instead of using the docker_dev, py.test builds and runs containers
* Travis-CI hopefully can run these same tests on PR/Merges now
2016-07-18 10:44:55 -05:00
fae728415f
Merge pull request #21 from diginc/dev
...
Release dev branch work to master
2016-07-16 16:06:46 -05:00
4225e4cd7c
remove a few unecessary lines
2016-07-16 16:02:49 -05:00
d2024cda37
Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev
2016-07-16 16:00:52 -05:00
b3879c8729
Fix to debian lighttpd php config #19 w/tests
2016-07-16 16:00:20 -05:00
1ff52f72b3
Merge pull request #20 from diginc/release_2.8.1
...
Bumping pi-hole to 2.8.1
2016-07-15 22:50:57 -05:00
c7245a6787
Bumping pi-hole to 2.8.1
2016-07-15 22:47:42 -05:00
b3f436ef4a
README cron section update
2016-07-10 23:32:32 -05:00
629478f050
Merge pull request #18 from diginc/dev
...
Release pi-hole v2.7.1 and web fork
2016-07-09 23:24:12 -05:00
302d370dab
Updating the AdminLTE version to stop alerting about updates
2016-07-09 23:07:50 -05:00
d8b43ae9d5
If users don't set VHOST, pass ServerIP to it for fixing Docker0 NAT CORS problem #16
2016-07-08 08:25:38 -05:00
681d79fd65
Merge pull request #17 from diginc/logging_and_refactor_CORS
...
Working whitelist / blacklist in docker containers.
2016-07-08 08:10:59 -05:00
f67e3367c5
point git submodule to AdminLTE fork
2016-07-08 07:55:38 -05:00
e3d9b472cb
PATH for /usr/local was missing for php-fpm
2016-07-08 07:43:47 -05:00
d2f7043f2b
Various changed to docker to make CORS happy and customizable
2016-07-07 23:34:41 -05:00
492638fca2
php whitelist/blacklist still not quite working but closer
2016-07-07 00:19:39 -05:00
8722f786be
php whitelist/blacklist still not quite working but closer
2016-06-16 00:10:14 -05:00
Adam Hill
name
The Gitter Badger