64892423b6
Added 'WEBPASSWORD_FILE' environment variable to enable support for Docker Secrets.
...
If 'WEBPASSWORD' is set, 'WEBPASSWORD_FILE' is ignored. If 'WEBPASSWORD' is empty, and 'WEBPASSWORD_FILE' is set to a valid readable file, then 'WEBPASSWORD' will be set to the contents of 'WEBPASSWORD_FILE'.
Signed-off-by: Daniel <daniel@developerdan.com>
2020-02-26 13:13:20 -05:00
3765d41b5c
Update way too much
...
- Tox py3.7 + pipenv
- Python3 Dockerfile.py
- Dockerfile.py tags remote instead of just local image names now
- Circle.sh instead of in-line circle.yml script breakout
- probably other stuff I forgot
- Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers.
- Rename aarch64 to arm64 to reduce custom map
2020-01-30 20:26:57 -06:00
fd48454649
Revert "initial commit on configdir as volume"
...
This reverts commit c1fb17a645
2019-06-01 12:16:14 -05:00
f950671a1c
missed test update
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:31:42 +02:00
c1fb17a645
initial commit on configdir as volume
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:12:58 +02:00
5dfa5398b8
Fix #364
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-17 00:18:34 -06:00
ca4fe84df2
add some more details to ouput to debut travis failure
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-13 23:26:21 -06:00
f71ecf0802
Fix default block list install
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 00:22:12 -06:00
7ecf7c6f28
Fixed tests!
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
fca7769b33
remove ServerIP requirement, simpler example commands
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -06:00
6629aff889
Allow running pihole-FTL as non-root
...
- Add a new container environment variable allowing to specify the user to run the pihole-FTL process as. Defaults to root.
- Set inherited capabilities attributes on the pihole-FTL file to automatically grant runtime permitted capabilities when available in the bounding set. This allows dropping root before starting pihole-FTL without failing with a permission error if the capabilities are not available to the container (the process may still error out if performing an operation requiring the capability).
- Add some information on capabilities to the Readme file.
Signed-off-by: Mathieu Hofman <86499+mhofman@users.noreply.github.com>
2019-02-06 02:31:33 -08:00
68d6c343a5
hotfix for bad grep
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-05 00:17:59 -06:00
1e2cdba3a3
change to calling it dnsmasq user
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 18:37:03 -06:00
0b8333f7bc
v4.2.1 & more robust user root fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 18:30:51 -06:00
cf1bb48fa8
run FTL as root
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 12:47:41 -06:00
d3309ebb1a
remove old blocking page setup/test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 22:43:38 -06:00
f3cf5dc858
Adding test and check for resolv.conf
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-10 00:28:39 -06:00
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
3870154ae3
Merge pull request #334 from dhutchison/development
...
Implemented missing support for DNSMASQ_LISTENING environment variable
2018-10-27 12:01:04 -05:00
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
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
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
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
d1c0ed9bf3
Dnsmasq config test
...
Exit during container startup if dnsmasq configs have any issues
2018-08-07 15:53:38 -05:00
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
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
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
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
119999be71
Fix web password corruption
...
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 15:58:05 -05:00
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
e7ae12a94c
Add fixes for config permissions, deprection notice
2018-08-02 22:50:01 -05:00
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
70acf54c2c
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
2018-07-10 23:16:40 -05:00
3afc1d43ff
Merge pull request #290 from StefanSchoof/SingleDns
...
allow no for DNS2
2018-07-10 23:14:19 -05:00
3171feef4c
allow no for DNS2
2018-07-06 08:01:41 +00:00
3877a171da
fix startup 53 port conflict and test error
2018-07-04 14:11:18 -05:00
ad6b4be403
Fixes to the startup, services, and dnsmasq references
2018-07-03 00:19:01 -05:00
af1816b7e5
Fixed malformed lighthttpd.conf when using host networking and setting WEB_PORT. Fixes #247
2018-06-23 00:04:08 -04:00
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
a9b41c7099
make the valid IP checks consistent between IPv4 and IPv6
2018-01-26 21:32:39 -06:00
91481efe48
Merge branch 'dev' into Installer_patches
2018-01-26 19:01:07 -06:00
c9165850c3
move init to a different name to fix s6-overlay issue #158
2018-01-26 19:00:06 -06:00
9b7e3998d6
Fix ServerIP v4 validation - error can also be about DNS not being up yet
2018-01-26 18:26:46 -06:00
62ddf72d15
exit on config fest failure
2018-01-25 12:45:05 -06:00
9427357489
Make Lighttpd also bind to localhost when using host network
2018-01-13 15:31:03 +00:00
3bcdd27cb9
fix ipv6 test
2018-01-04 22:30:40 -06:00
c4dc16685a
shrink 20-start.sh, merge to start.sh
2018-01-03 22:34:31 -06:00
615af98eab
delete all the alpine
2018-01-03 20:09:47 -06:00
d9fa9b1016
alpine 3.2 startup tests fixed, web still failing
2017-12-11 10:28:15 -06:00
7c6c48e133
rest of loading tests fixed, undo heredoc tab2space
2017-12-07 23:39:34 -06:00
988e17be7a
some of the debian_amd64 load_as_expected tests fixed, tab2spaces
2017-12-07 23:30:54 -06:00
aab0b3f3cb
fix debian test_pihole_start_cmd
2017-12-07 20:27:06 -06:00
eb7b0a1fd7
add firstboot marker allow setup of servers if they are passed in but never again
2017-11-19 23:15:44 -06:00
fd4e123ca2
README and small variable update
2017-11-14 22:46:17 -06:00
50fee7d832
Adding custom web port with tests
2017-11-14 22:33:05 -06:00
e6b175ed27
Merge pull request #172 from vidschofelix/patch-1
...
fix missing newline
2017-10-15 22:20:32 -05:00
499ebe2f8a
fix missing newline
2017-10-14 14:53:29 +02:00
f22ee44226
Switch to a single template instead of two, jinja logic
2017-10-04 11:05:27 -05:00
ead9ec564d
Fix extra / , and make if and grep checking consistent
2017-07-26 16:50:23 -05:00
11ec647a18
Fix indentation
2017-07-26 16:35:16 -05:00
3b91e17316
Move function to bash_functions, keep start.sh clean
2017-07-26 14:36:32 -05:00
78cb0c4a57
reseed original config if using volume
2017-05-23 09:22:16 -05:00
fbb130c066
Merge branch 'master' of github.com:diginc/docker-pi-hole into dev
2017-05-22 12:27:21 -05:00
c9b08e8848
documenting and validating the Server IP env vars
2017-05-19 00:36:53 -05:00
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
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
8d0ea48ecd
3.0.1 progress
2017-05-09 15:03:03 -05:00
9f61b87198
debian converted to s6, aline files moved
2017-05-05 21:48:03 -05:00
20955a41fe
alpine converted to s6
2017-05-04 22:37:26 -05:00
67346c2f75
fix up PIHOLE_INTERFACE default
2017-03-04 17:31:09 -06:00
d23338407c
bump versions, fix shell check failures
2017-03-03 23:13:11 -06:00
907d36ae9b
Add web password support
2017-02-08 22:46:46 -06:00
4ceae13015
shellcheck fix
2017-01-21 20:12:37 -06:00
746399ce4b
Ensured setupVars.conf is always present when changing settings from start.sh
2017-01-21 16:03:08 -05:00
5404d6124f
re-do a few things to fix up test/handle updated code
2017-01-17 22:49:42 -06:00
ce49b19ade
Merge pull request #82 from mattkenn4545/feature/dns-is-important
...
Ensure DNS is available early
2017-01-09 10:42:38 -06:00
ef96fbc809
debian images building, alpine WIP
2017-01-08 10:42:39 -06:00
0d87eaeb58
DNS is important! Dnsmasq should come up early and not rely on gravity update.
2017-01-07 21:51:12 -07:00
a6020cbfa5
Fix alpine web log follow error
2016-11-06 13:41:14 -06:00
afa0f89096
Fixing setup_php_env (Green)
2016-11-01 22:46:29 -05:00
99c4921a84
common_start.sh now bash_functions.sh, dnsmasq test clarified
2016-10-30 13:47:06 -05:00
Daniel
Adam Hill
Martin Buchleitner
Mathieu Hofman
David Hutchison
StefanSchoof
Andrew Lefchak
DerFetzer
vidschofelix
FrozenDragoon
Walter Treur
Matthew Kennedy