Commit Graph

106 Commits

Author SHA1 Message Date
Adyanth H 437e8ddbf5 Change tab to spaces
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
2021-06-16 10:53:28 +05:30
Adyanth H 901ee3d10b Adding CORS_HOSTS to PHP environment
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
2021-06-07 16:01:39 +05:30
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 dba2317072
Merge pull request #769 from ignic/dhcp_setup
Enable DHCP Server with environment variables
2021-04-16 23:45:43 +01:00
Adam Warner 87c99a0b8c
Merge pull request #823 from limes007/master
Make test of IPv6 env variable case insensitive
2021-04-16 19:40:25 +01:00
Kyle Kurz f53015157d
Issue #824 - Don't log password (#825)
When setting the password, explicitly disable bash logging. Leave the
re-enable code so that other functions work as expected. Additionally,
do not remove the print in generate_password so randomly generated
passwords are still logged for user consistency.

Signed-off-by: Kyle Kurz <kyle@doublekaudio.com>
2021-04-14 17:13:01 +01:00
limes007 ededb44601 fix test of IPv6 env variable
Signed-off-by: limes007 <39467727+limes007@users.noreply.github.com>
2021-04-09 21:10:53 +02:00
Adam Warner 6b6ba9b458
accidentally a reference
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-10 17:46:09 +00:00
Tyler Spires c23b1d6894
forgot to remove the dhcp.leases from the original line.
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2021-02-10 17:31:47 +00:00
Tyler Spires 29cf35b2c5
Fixing error with dhcp.leases too.
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2021-02-10 17:31:33 +00:00
Adam Warner 8cf36e6f7e
Remove chmod of no longer used file
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-10 17:31:31 +00:00
MichaIng 512f610afa Skip full distro check on start
The distro_check function includes updating the APT cache, checking for dependencies, which is both not required on Docker start where all required packages are installed already. The only required steps from this function is the webserver user and config file names, which can be applied directly instead since we know that the Pi-hole Docker container is based on Debian.

Furthermore this solves the issue that updating the APT cache fails, when Pi-hole itself is used for DNS resolution, since pihole-FTL has not yet been started at this stage. That failure was not visible since "apt-get update" does not exist with error code (currently) when facing DNS resolving issues, even if not a single list could have been updated, and no other step is done that would require DNS resolving, until pihole-FTL is started. For a regular (non-Docker) install or update it is however reasonable to error out directly when the APT cache could not have been updated, to not defer the exit unnecessarily to a harder-to-debug stage.

Signed-off-by: MichaIng <micha@dietpi.com>
2021-01-24 15:14:18 +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 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
Daniel 752d83aeaa
Introduce additional docker tags for the debian version.
* Added new docker tag variations to specify the debian version ('stretch', and 'buster').
* Arch images are alway as specific as possible: pihole/pihole:master-amd64-stretch
* Multiarch images have both the specific debian version tags as well as the generic non-debian tags: pihole/pihole:master-stretch & pihole/pihole:master
* Currently, the non-specific tags point to the 'stretch' images. Eventaully it can be migrated to 'buster'.
* Use GitHub actions to do the builds. Although the script names include 'gh-actions' to differentiate them from the 'circle' scripts, there is zero logic that is specific to Github (ie. no Github environment variables).
* 'armhf:buster' & 'arm64:buster' has an issue with `ip route get`. I think the issue is related to 'qemu', but I'm not sure. Update the `validate_env` function to only use `ip route get` if `nc` reports something strange.

Signed-off-by: Daniel <daniel@developerdan.com>
2020-06-29 09:34:19 -04: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 e7bb456701
Merge branch 'dev' into patch-1 2020-05-30 14:23:27 -05:00
Sandro ecb0aaf805
Don't bind to 127.0.0.1 when listening on all ports
Closes #495

Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2020-05-30 07:04:55 +02: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
Adam Hill d444a11ad1 Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into beta-v5.0 2020-05-10 11:58:22 -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
Adam Hill 3c510e2edb remove HTML web port sed/test, no hits exist anymore
Signed-off-by: Adam Hill <adam@diginc.us>
2020-04-18 15:18:15 -05: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
Adam Hill 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
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 f950671a1c missed test update
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:31:42 +02: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
Adam Hill 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
Adam Hill f71ecf0802
Fix default block list install
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 00:22:12 -06:00
Adam Hill 7ecf7c6f28
Fixed tests!
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
Adam Hill fca7769b33
remove ServerIP requirement, simpler example commands
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -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 68d6c343a5
hotfix for bad grep
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-05 00:17:59 -06:00
Adam Hill 1e2cdba3a3
change to calling it dnsmasq user
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 18:37:03 -06:00
Adam Hill 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
Adam Hill cf1bb48fa8
run FTL as root
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 12:47:41 -06:00
Adam Hill d3309ebb1a
remove old blocking page setup/test
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 22:43:38 -06:00
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