Commit Graph

19 Commits

Author SHA1 Message Date
diginc 7465c0b064 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
Conflicts:
	common_start.sh
2016-10-22 13:13:11 -05:00
diginc c9468eaabd Pi-hole and Web versions update + new stuff
* New code in shell scripts required killing systemctl in images
* Added tests for the quick IPv6 env hack I made a while back
* Stopped requiring the need for update.sh to copy gravity for alpine
 * (moved modifications to dockerfile)
* One step closer to unified start script for both OS versions
* Optimzed some test code
2016-10-20 22:44:44 -05:00
diginc 21eee5a0ca Shellcheck added to py.test and fixes
- Various minor quote fixes
- Optimized repeated echos into php conf for alpine
2016-10-08 14:56:06 -05:00
diginc 34419c5631 do not need these prints any more 2016-10-08 13:40:36 -05:00
diginc 61da6ce0ad fixes #55 DNS1 & DNS2 bug
- tests now watch for regression in these ENV var's behavior
- use local scope in function instead of exported for easier testing
2016-10-08 13:34:25 -05:00
diginc 822903189c Fixing issues with 1.9.2
- Case on IPv4addr was incorrect, gravity now requires it instead of piholeIP file
- debian:jessie no longer had dnsutils dig?  odd.
- py.test always pull the latest docker images to help reveal base image changes like above
- py.test stubbing of gravity was acciently not present in debian arm's start.sh
- pihole submodule using development branch latest
2016-10-06 18:51:05 -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
diginc e8cb52b23a ipv6 tests I skipped the other night 2016-09-07 20:39:01 -05:00
diginc 0204786139 adding armhf build for testing 2016-08-30 20:07:32 -05:00
diginc c341e0316f adding some missing files from merger mistakes 2016-08-28 02:30:10 -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 0b54098462 Revert "py.test now builds containers, travis py.test" 2016-08-28 01:31:23 -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 3b74e8d3e3 Tests working again, along with persistent tests with an actual running pi-hole container 2016-08-28 00:45:26 -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
diginc 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
diginc 4225e4cd7c remove a few unecessary lines 2016-07-16 16:02:49 -05:00
diginc b3879c8729 Fix to debian lighttpd php config #19 w/tests 2016-07-16 16:00:20 -05:00