Commit Graph

51 Commits

Author SHA1 Message Date
Adam Warner 8c62a1437a
Merge pull request #690 from damajor/patch-1
Add QUERY_LOGGING missing export
2020-12-03 18:18:12 +00:00
Adam Warner 941e433834
accidentally 4x=
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-11-30 22:15:31 +00:00
Adam Warner e7bfad6301
Introduce new REV_SERVER environment variables. Deprecate CONDITIONAL_FORWARDING ones, but maintain backward compatibility
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-11-30 21:46:50 +00:00
-_- 2c7be7c3cb
Add missing QUERY_LOGGING in export list 2020-10-11 17:23:03 +02:00
Adam Hill 9213bbd322 Merge branch 'dev' of github.com:diginc/docker-pi-hole into no_resolv_check
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-30 18:03:05 -05:00
Adam Hill 808359e832
Merge pull request #608 from ahuffman/master
Fixes #557
2020-05-27 00:02:06 -05:00
Adam Hill d7fdb188ed remove resolv conf checks
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:45:48 -05:00
Andrew J. Huffman 2228115a97
Fixes #557
* Refactored the prepare_configs function in bash_functions.sh
* Now able to set settings via the UI or ENV Variables - ENV Variables override when restarted
* Added ENV Variables for ADMIN_EMAIL, TEMPERATUREUNIT, and WEBUIBOXEDLAYOUT
    - Created setup_temp_unit function in bash_functions.sh
    - Created setup_ui_layout function in bash_functions.sh
    - Created setup_admin_email function in bash_functions.sh
* Updated README.md
    - Added docs on new ENV Variables
    - Updated True/False settings docs so they were quoted, otherwise misleading to k8s users and not "true" booleans

Signed-off-by: Andrew J. Huffman <ahuffman@vmware.com>
2020-05-04 17:29:47 -04:00
Daniel 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
Jeff Billimek 4dffbf031c Add new optional env variable DNS_FQDN_REQUIRED
This new optional env variable will allow control over the 'Never
forward non-FQDNs' advanced DNS setting.

Signed-off-by: Jeff Billimek <jeff@billimek.com>
2019-10-16 00:29:40 -04:00
Rui Marinho cec9ffb36b Add support for additional env var config 2019-08-31 19:17:19 +01:00
Adam Hill fd48454649
Revert "initial commit on configdir as volume"
This reverts commit c1fb17a645.

Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-01 12:16:14 -05:00
Martin Buchleitner c1fb17a645 initial commit on configdir as volume
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:12:58 +02:00
Adam Hill 5dfa5398b8
Fix #364
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-17 00:18:34 -06:00
Mathieu Hofman 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
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
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 d7ad16e6d6
removing deprecation
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-14 22:39:03 -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 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 73f05e6d35
A bunch of name changes
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 11:40:37 -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 45a196d9c4 Move FTL_CMD to dockerfile 2018-04-10 12:33:25 -05:00
Adam Hill fed2f7f4d3
Update start.sh 2018-04-10 10:07:23 -05:00
Adam Hill 9d5cc46f30
Should probably get dev working again
apologies for any issues the default FTL_CMD bug caused
2018-03-06 09:16:32 -06:00
diginc 1c598d3078 adding FTL_CMD for debug 2018-03-01 22:16:38 -06: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 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 f22ee44226 Switch to a single template instead of two, jinja logic 2017-10-04 11:05:27 -05:00
= 5d0706613d Fix passing in DNS1 and DNS2 env vars to setup_dnsmasq 2017-09-03 01:57:52 -05:00
FrozenDragoon 3b91e17316 Move function to bash_functions, keep start.sh clean 2017-07-26 14:36:32 -05:00
BuildTools 685cfe751a If running in debian image, make Lighttpd only listen on one IP. See diginc/docker-pi-hole#154 2017-07-26 14:06:31 -05:00
diginc c9b08e8848 documenting and validating the Server IP env vars 2017-05-19 00:36:53 -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 67346c2f75 fix up PIHOLE_INTERFACE default 2017-03-04 17:31:09 -06:00
Adam Hill e8d5f0c1b4 Update start.sh
stop printing debug in the docker log down ;)
2017-02-09 13:01:34 -06:00
diginc 907d36ae9b Add web password support 2017-02-08 22:46:46 -06:00
Walter Treur 746399ce4b Ensured setupVars.conf is always present when changing settings from start.sh 2017-01-21 16:03:08 -05:00
diginc 5404d6124f re-do a few things to fix up test/handle updated code 2017-01-17 22:49:42 -06:00
diginc a6020cbfa5 Fix alpine web log follow error 2016-11-06 13:41:14 -06:00
diginc 99c4921a84 common_start.sh now bash_functions.sh, dnsmasq test clarified 2016-10-30 13:47:06 -05:00
diginc cb66d578a5 start needs correct permissions 2016-10-30 12:19:42 -05:00
diginc 6a1d16d6fb latest version of pi-hole/web, refactor, fixes 2016-10-30 12:13:52 -05:00
diginc 2cfb144fe5 start split for each OS directory to keep debian functional 2016-02-13 13:28:10 -06:00
diginc 972a6c3c39 alpine nginx pihole working, weighing in at 85.36 MB vs debian 252.4 MB 2016-02-13 13:24:44 -06:00