1
0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 09:09:07 +02:00
Commit Graph

168 Commits

Author SHA1 Message Date
Stephen Souness
a51f69bef9 Couple of typos in docs. 2021-02-12 19:23:55 +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
8c62a1437a
Merge pull request #690 from damajor/patch-1
Add QUERY_LOGGING missing export
2020-12-03 18:18:12 +00:00
Adam Warner
121f3f92c9
Merge pull request #714 from mparramont/patch-1
Fix file to copy in  README.md
2020-12-02 21:32:52 +00:00
Miguel Parramon
b669826149 Update README.md
😄

Signed-off-by: Miguel Parramón <mparramont@gmail.com>
2020-12-02 15:36:57 +08:00
DL6ER
105eb1165f
Update README.md
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2020-12-01 19:56:55 +01: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
-_-
e67952eaec
Merge branch 'dev' into patch-1 2020-11-12 22:44:42 +01:00
-_-
9324107088
QUERY_LOGGING Documentation update 2020-10-11 17:28:37 +02:00
Daniel
a779c7fc37
Make the default debian version buster, preserve the 'stretch' tag for those who need it.
Signed-off-by: Daniel <daniel@developerdan.com>
2020-09-28 17:12:03 -04:00
Adam Hill
87132465b5
Merge pull request #672 from AthrogatePEQ/master
Ability to skip Gravity refresh on startup
2020-08-22 20:38:17 -05:00
Athrogate
97d00cd936 Update README.md
Documenting the SKIPGRAVITYONBOOT variable.

Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Athrogate
5a35eca5e2 Update README.md
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Athrogate
6e5bf71595 Update README.md
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Athrogate
a9f423ff37 Update README.md
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Athrogate
a30bd0528f Update README.md
Signed-off-by: Tyler Spires <shadrach145@gmail.com>
2020-08-22 18:17:17 -04:00
Felix Wong
93b86c8981
use docker-compose example yaml
Signed-off-by: Felix Wong <felix@fawong.com>
2020-08-17 20:09:39 +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
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
Daniel
6939ea024f
Simplify Dockerfile configuration.
* Simplify docker builds by consolidating all arch's into a single Dockerfile and using ARGS for various differences
* Introduce docker-compose based builds (build.yml) for simple management of the various args differences

Signed-off-by: Daniel <daniel@developerdan.com>
2020-05-15 16:06:48 -04:00
Adam Hill
8cb67fde23
Merge pull request #515 from mgalgs/docker-run-storage-dir
docker_run.sh: Add env var to specify storage directory
2020-05-11 19:02:30 -05:00
Adam Hill
032b53799d
Merge pull request #534 from warren-fisher/dev
Add to Ubuntu install section
2020-05-06 21:46:29 -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
0570d264ed
Merge pull request #564 from losuler/dev
Fix minor spelling mistake
2020-02-16 13:01:36 -06:00
Adam Hill
f0a9a9fb04
Merge pull request #565 from scott-kirk/patch-1
Minor spelling mistake in README
2020-02-09 12:46:43 -06:00
Scott Kirkpatrick
bf0a9190c8
Minor spelling mistake in README 2020-02-09 11:19:04 -05:00
losuler
1add81a1ce Fix minor spelling mistake
Signed-off-by: losuler <losuler@users.noreply.github.com>
2020-02-09 17:27:48 +11:00
Warren Fisher
6e38238dc1 Add to Ubuntu install section
Add info about restarting systemd-resolved

Signed-off-by: Warren Fisher <github@warrenfisher.dev>

Add to Ubuntu install section

Signed-off-by: Warren Fisher <github@warrenfisher.dev>
2019-11-17 16:33:30 -04: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
Mitchel Humpherys
b5356568d5 docker_run.sh: Add env var to specify storage directory
Currently `docker_run.sh` bind-mounts some directories rooted at the
working directory when the script is invoked.  Add an environment variable
so that this storage location can be specified at invocation time without
having to change to a different directory.

Also creates PIHOLE_BASE if it doesn't exist already.
2019-09-30 11:44:40 -07:00
kaysond
e7174adaf1 Update README.md to include detailed Ubuntu install tips
Signed-off-by: kaysond <kaysond@hotmail.com>
2019-09-20 18:33:02 -07:00
Adam Hill
79ecb74140
Merge pull request #481 from danielhoherd/patch-1
Correct inconsistent indentation
2019-09-01 14:21:07 -05:00
Rui Marinho
cec9ffb36b Add support for additional env var config 2019-08-31 19:17:19 +01:00
Alexis Lefebvre
226d7239e5
Fix typo s/equivilent/equivalent/ 2019-08-12 00:01:42 +02:00
Daniel
fa044d0129 Correct inconsistent indentation
the contents of `volumes` was indented an extra space.

Signed-off-by: Daniel Hoherd <daniel.hoherd@gmail.com>
2019-07-06 10:09:33 -07:00
Adam Hill
7d36ab2ff9
Update README.md 2019-04-24 13:39:44 -05:00
Adam Hill
5f8b01bce3
Update README.md
Clarify that people running --net=host should set ServerIP for Pi-hole to function correctly.

I'll have to try to add some automation around this later to try to warn only the network host mode users if they miss it.
2019-04-24 13:37:45 -05:00
DK
2a973474fd
Fix typo
Pretty sure 54 is a typo and should be 53.
2019-04-15 09:06:29 -07:00
Adam Hill
95a665c057
Update README.md 2019-02-18 14:11:13 -06:00
Adam Hill
e5ad7aea55
A bunch of readme tweaks
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-14 22:06:16 -06:00
Adam Hill
1685ed342f
Another flaky test, logs of readme
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-09 02:08:20 -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
83cd82906d
Merge branch 'master' into vincent-extra-sleep 2019-01-13 13:49:37 -06:00
Vincent Perricone
403a205b2a Remove excess bash from Readme
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-13 14:48:27 -05:00
Adam Hill
1c34c2a1ee
Fix extra tic in docker run, indendation
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-13 13:47:39 -06:00
Adam Hill
a8e1746476
FTLDNS
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-13 13:02:20 -06:00
Vincent Perricone
98faf1e5f9 Move docker args to bottom for --env-file to put with other Optionals
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
2019-01-12 22:36:17 -05:00