Commit Graph

65 Commits

Author SHA1 Message Date
Adam Hill f3cf5dc858
Adding test and check for resolv.conf
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-10 00:28:39 -06:00
Adam Hill 19fee6fa5e
README update for 4.1.1 and test improvement
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success

Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-08 21:01:42 -06:00
Adam Hill 3870154ae3
Merge pull request #334 from dhutchison/development
Implemented missing support for DNSMASQ_LISTENING environment variable
2018-10-27 12:01:04 -05:00
Adam Hill c290324185
Change password logic completely to avoid any extra debug prints
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-16 19:57:25 -05:00
Adam Hill f1b34887f8
The debug printing logic was inverted here. Left on without debug enabled, turned off when debug was enabled
Signed-off-by: Adam Hill <adam@diginc.us>
2018-10-16 19:14:02 -05:00
David Hutchison 7515c10a69 Implemented missing support for DNSMASQ_LISTENING environment variable
Signed-off-by: David Hutchison <dhutchison86+github@googlemail.com>
2018-09-29 22:20:33 +01:00
Adam Hill 63f2c4ea00
Fixing error with random passwords, null checking moved earlier
Signed-off-by: Adam Hill <adam@diginc.us>
2018-09-18 00:11:26 -05:00
Adam Hill d1c0ed9bf3
Dnsmasq config test
Exit during container startup if dnsmasq configs have any issues
2018-08-07 15:53:38 -05:00
Adam Hill 41b1d04100
Do not delete the setting before sourcing the file :}
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-06 07:46:29 -05:00
Adam Hill f8d37693ed
Fix regex writing for web, fix deploying latest
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 22:23:22 -05:00
Adam Hill 65a1ac7f1e
grab version on startup for web footer. 2 tests stablized
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:20:55 -05:00
Adam Hill 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
Adam Hill 119999be71
Fix web password corruption
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:58:05 -05:00
Adam Hill 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
Adam Hill e7ae12a94c
Add fixes for config permissions, deprection notice 2018-08-02 22:50:01 -05:00
Adam Hill 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
diginc 70acf54c2c Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease 2018-07-10 23:16:40 -05:00
Adam Hill 3afc1d43ff
Merge pull request #290 from StefanSchoof/SingleDns
allow no for DNS2
2018-07-10 23:14:19 -05:00
StefanSchoof 3171feef4c allow no for DNS2 2018-07-06 08:01:41 +00:00
diginc 3877a171da fix startup 53 port conflict and test error 2018-07-04 14:11:18 -05:00
diginc ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
Andrew Lefchak af1816b7e5 Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247 2018-06-23 00:04:08 -04:00
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 a9b41c7099 make the valid IP checks consistent between IPv4 and IPv6 2018-01-26 21:32:39 -06:00
Adam Hill 91481efe48
Merge branch 'dev' into Installer_patches 2018-01-26 19:01:07 -06:00
diginc c9165850c3 move init to a different name to fix s6-overlay issue #158 2018-01-26 19:00:06 -06:00
diginc 9b7e3998d6 Fix ServerIP v4 validation - error can also be about DNS not being up yet 2018-01-26 18:26:46 -06:00
diginc 62ddf72d15 exit on config fest failure 2018-01-25 12:45:05 -06:00
DerFetzer 9427357489 Make Lighttpd also bind to localhost when using host network 2018-01-13 15:31:03 +00:00
diginc 3bcdd27cb9 fix ipv6 test 2018-01-04 22:30:40 -06:00
diginc c4dc16685a shrink 20-start.sh, merge to start.sh 2018-01-03 22:34:31 -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 fd4e123ca2 README and small variable update 2017-11-14 22:46:17 -06:00
diginc 50fee7d832 Adding custom web port with tests 2017-11-14 22:33:05 -06:00
Adam Hill e6b175ed27 Merge pull request #172 from vidschofelix/patch-1
fix missing newline
2017-10-15 22:20:32 -05:00
vidschofelix 499ebe2f8a fix missing newline 2017-10-14 14:53:29 +02:00
diginc f22ee44226 Switch to a single template instead of two, jinja logic 2017-10-04 11:05:27 -05:00
FrozenDragoon ead9ec564d Fix extra / , and make if and grep checking consistent 2017-07-26 16:50:23 -05:00
FrozenDragoon 11ec647a18 Fix indentation 2017-07-26 16:35:16 -05:00
FrozenDragoon 3b91e17316 Move function to bash_functions, keep start.sh clean 2017-07-26 14:36:32 -05:00
diginc 78cb0c4a57 reseed original config if using volume 2017-05-23 09:22:16 -05:00
diginc fbb130c066 Merge branch 'master' of github.com:diginc/docker-pi-hole into dev 2017-05-22 12:27:21 -05:00
diginc c9b08e8848 documenting and validating the Server IP env vars 2017-05-19 00:36:53 -05:00
Adam Hill 1fc738c754 Hotfix php-fpm5 binary for old version
Fixes #127

Sorry, I had to rebuild the newest tag to re-release the readme to docker hub/store and the re-build broke things.
2017-05-15 13:40:44 -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