1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-07-02 22:20:58 +02:00
Commit Graph

63 Commits

Author SHA1 Message Date
diginc
53f766876e Adding fix for #229
* Updates references in /var/www/html to also use WEB_PORT custom HTTP port
* Also a deploy script I use for uploading ARM/Multiarch so I stop pulling it out of bash history
2018-02-22 23:11:53 -06:00
diginc
3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc
b33ea3b77f fixed the tests 2018-01-03 21:35:53 -06:00
diginc
615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc
d9fa9b1016 alpine 3.2 startup tests fixed, web still failing 2017-12-11 10:28:15 -06:00
diginc
7c6c48e133 rest of loading tests fixed, undo heredoc tab2space 2017-12-07 23:39:34 -06:00
diginc
988e17be7a some of the debian_amd64 load_as_expected tests fixed, tab2spaces 2017-12-07 23:30:54 -06:00
diginc
aab0b3f3cb fix debian test_pihole_start_cmd 2017-12-07 20:27:06 -06:00
diginc
eb7b0a1fd7 add firstboot marker allow setup of servers if they are passed in but never again 2017-11-19 23:15:44 -06:00
diginc
50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
diginc
94c90d9b91 comma 2017-11-05 21:30:32 -06:00
diginc
bcfcc85ef3 removed impossible testing combos 2017-11-05 21:30:07 -06:00
diginc
8886784b2e fix webserver and image 2017-10-18 22:24:22 -05:00
diginc
dded3945f5 switch to dash, update persist to use new style tag 2017-10-18 22:02:23 -05:00
diginc
7c85ac8d32 Split build out from tests to ensure it runs first 2017-10-16 23:45:39 -05:00
diginc
b372f0101d move docker image building to be a global autouse fixture to make sure it runs before tests that use output 2017-10-08 12:57:17 -05:00
diginc
d98837c828 expand most tests to run for all os arch combos 2017-10-05 11:59:19 -05:00
diginc
3c6db584d7 split out test builds for each arch to help avoid travis timeout 2017-10-02 23:46:42 -05:00
diginc
18997fe9f6 templated dockerfiles building used by tests
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
2017-10-02 22:52:02 -05:00
diginc
038930959f new version 2017-06-23 23:42:01 -05:00
diginc
c9b08e8848 documenting and validating the Server IP env vars 2017-05-19 00:36:53 -05:00
diginc
0e2b77577d adding a alpine compatible list.sh 2017-05-13 18:43:34 -05:00
diginc
b9095bc123 This commit is too big, but it works
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
2017-05-13 17:03:24 -05:00
diginc
9f61b87198 debian converted to s6, aline files moved 2017-05-05 21:48:03 -05:00
diginc
20955a41fe alpine converted to s6 2017-05-04 22:37:26 -05:00
diginc
67346c2f75 fix up PIHOLE_INTERFACE default 2017-03-04 17:31:09 -06:00
diginc
d23338407c bump versions, fix shell check failures 2017-03-03 23:13:11 -06:00
diginc
907d36ae9b Add web password support 2017-02-08 22:46:46 -06:00
diginc
4f1fb5ec01 Revert "re-enable arm as part of testing".
This reverts commit 14f7654549.

docker cloud runs a build for arm now and travis-ci times out on arm building through qemu.
2017-01-18 20:30:10 -06:00
diginc
14f7654549 re-enable arm as part of testing 2017-01-17 23:13:24 -06:00
diginc
5404d6124f re-do a few things to fix up test/handle updated code 2017-01-17 22:49:42 -06:00
diginc
73c054cbc5 runing as sh breaks tests, override testinfra 2017-01-17 22:48:59 -06:00
diginc
d528878bac test passing...travis virtual environment is another story 2017-01-11 20:12:56 -06:00
diginc
9f20dcc708 disabled real adlists by default 2017-01-10 22:58:27 -06:00
diginc
136f43a995 various test fixes 2017-01-10 20:38:42 -06:00
Adam Hill
ce49b19ade Merge pull request #82 from mattkenn4545/feature/dns-is-important
Ensure DNS is available early
2017-01-09 10:42:38 -06:00
diginc
cc1c7a745d resolving alpine+nginx issues 2017-01-08 23:43:12 -06:00
Matthew Kennedy
0477dea085 Fix tests 2017-01-07 22:36:31 -07:00
diginc
f9bb0c976a add pihole enable/disable tests 2016-11-06 15:12:11 -06:00
diginc
f6006e09d5 add test for pihole scripts, restartDNS first test 2016-11-06 13:41:43 -06:00
diginc
6ec264e3b6 rename/clarify test and move RunningPiHole to global py.test scope 2016-11-06 13:40:24 -06:00
diginc
097f280c9b red test 2016-11-01 22:32:36 -05:00
diginc
eddba93537 split out the bash function tests to own file 2016-10-31 23:42:08 -05:00
diginc
99c4921a84 common_start.sh now bash_functions.sh, dnsmasq test clarified 2016-10-30 13:47:06 -05:00
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