Commit Graph

75 Commits

Author SHA1 Message Date
Adam Warner e1dc289d7d
Fix suggested spelling mistakes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-22 17:41:29 +01:00
haxwithaxe fb112ce1bf Handles docker service names with and without ports.
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-14 18:20:19 -04:00
haxwithaxe 06569a5bcd Handles docker service names with ports.
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-14 18:02:41 -04:00
haxwithaxe 1c24b96048 Fixed references to IP(s) to entry/entries in PIHOLE_DNS_ parsing block of start.sh.
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-13 22:46:21 -04:00
haxwithaxe ae5a5afdc5 Added support for docker links (domain names) as DNS servers.
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-13 22:40:56 -04:00
Adam Warner 9436389095
accidentally a complete path
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-09 21:35:21 +00:00
Adam Warner e0f05ef372
Remove any existing PIHOLE_DNS_ configurations before applying those that have been passed in via env var
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-09 21:05:53 +00:00
Alexander Lieret 28892f4533
Update list of available web themes
Signed-off-by: Alexander Lieret <alexander.lieret@fau.de>
2022-01-06 17:16:04 +01:00
AlexandreRatte 4aaf0998a3
Customize pihole-FTL.conf with FTLCONF_ prefixed environment variables. (#944)
* Customize pihole-FTL.conf with FTLCONF_ prefixed environment variables.

Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>

* Reintroduced parsing of ServerIP* env vars and amended README for deprecated variables.

Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-11-26 16:58:10 +00:00
Dan Schaper a26eb9c6ad
Set FTL REPLY addresses instead of setupVars.conf.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-08-19 17:29:54 -07:00
Alexandre Ratte 2484c9ced2 Merge branch 'dev' of https://github.com/AlexandreRatte/docker-pi-hole into Issue_778
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:38:43 -04:00
Alexandre Ratte c4caf293f7 Amended comment.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:34:09 -04:00
Alexandre Ratte 995ec08608 Changed invalid WEBTHEME value's fallback theme to default-light, to stay inline with pi-hole's default.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:31:24 -04:00
Alexandre Ratte 504f3bac3b Added WEBTHEME parsing.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-05-15 08:31:24 -04:00
jparenas 73378d1231 Add CUSTOM_CACHE_SIZE environment variable to the available options
Signed-off-by: jparenas <juan.p.arenas1@gmail.com>
2021-05-08 16:11:57 -05:00
Adam Warner 5ca1dbf35f
Massive overhaul of `install.sh based on how I test fresh installs of differing branches/tags
First git clone the repos, next checkout the relevant branches and finally run the install script. Simples.
`sed`ed out a couple of other unsupported functions

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:06:00 +01:00
Adam Warner 784be64178
Merge pull request #839 from pi-hole/tweak/valid_ip
Check for validity of values passed in through `PIHOLE_DNS_`
2021-04-17 11:17:25 +01:00
Adam Warner f6b9716a75
Additionally, exit script if 0 valid entries are detected
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 23:19:58 +01:00
Adam Warner 14e3bcb480
Check for validity of values passed in through `PIHOLE_DNS_` Throw away junk.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-16 22:56:09 +01:00
Ignacio Serrano c5f682d1e7 allows DHCP server setup with env vars
Signed-off-by: Ignacio Serrano <ignic@ignic.com>
2021-01-23 21:23:05 +01:00
Adam Warner 39090babf5
Ensure that QUERY_LOGGING value is persisted between container runs
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-09 21:45:17 +00:00
Adam Warner 0cb7324a60
Further simplifications
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-16 22:19:20 +00:00
Adam Warner f77e4609ce
Introduce new env VAR for setting PIHOLE_DNS_x values.
If not set, keep existing values in setupVars
if no existing values in setupVars - fall back to defaults

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-16 21:41:09 +00:00
Adam Warner 5d1d394b1b
Test for env vars being set before changing settings. Should preserve values set in setupVars.conf
Co-authored-by: xBelladonna <isabelladonnamoore@outlook.com>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-12-04 11:20:16 +00:00
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