docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity
1,126 Commits 10 Branches 114 Tags 4.6 MiB
Commit Graph

202 Commits

Author SHA1 Message Date
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
Vincent Perricone c9050fef72 Update Readme 
Signed-off-by: Vincent Perricone <vhp@fastmail.fm>
 2019-01-12 22:34:02 -05:00
Adam Hill f1f3e35086
Small readme tweaks 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-12 19:34:35 -06:00
Adam Hill b2aecc497a
remove comment mid docker run, it breaks the command 
Signed-off-by: Adam Hill <adam@diginc.us>
 2019-01-12 17:34:34 -06:00
Adam Hill d4a7059bef
Merge branch 'dev' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs 2019-01-10 20:55:15 -06:00
Adam Hill a7a5ef516b
Merge branch 'master' of github.com:diginc/docker-pi-hole into resolvconf_check_and_docs 2019-01-10 20:05:40 -06:00
Adam Hill 547d1f6b9b
Merge pull request #374 from cyounkins/dhcp 
net=host is the only way to use DHCP
 2019-01-10 09:55: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
Craig Younkins 5ded3accab net=host is the only way to use DHCP 
Signed-off-by: Craig Younkins <cyounkins@gmail.com>
 2018-12-14 14:22:50 -05:00
homdx 94331af79c
SELinux policy instruction 2018-12-12 23:56:35 +03:00
reloxx13 1b2adcf02c
readme fix dev docker tag 2018-11-07 20:58:22 +01:00
Adam Hill 4907bc533d
generic iproute output parsing 
Fixes #346
Fixes #312
 2018-10-31 20:11:16 -05:00
Steven 89a7c7f022
README.md - fixed typo 2018-10-25 05:24:26 +00:00
Adam Hill 2d1c515d25
Update README.md 2018-10-20 23:40:16 -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 e410f69f52
Clarify the secondary DNS being optional 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-16 09:19:37 -05:00
Adam Hill 173707fb2d
adding more dns setting documentation 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-10-15 22:35:13 -05:00
Adam Hill 710f7bff27
Merge branch 'master' of github.com:diginc/docker-pi-hole into development 2018-10-15 22:11:42 -05:00
Elias Ojala ecb9ecee37 Added syntax highlighting 
Signed-off-by: Elias Ojala <git@eliasojala.me>
 2018-10-11 21:02:20 +03:00
Adam Hill dcd70b62eb
Merge branch 'master' into patch-1 2018-09-18 00:25:32 -05:00
Adam Hill 0dec8ad9f4
Update README.md 
Adding Docker Pi-hole to top for SEO
 2018-09-10 14:12:45 -05:00
Jerry Chong cbc650a9aa
Update README.md 
Fix a minor typo
 2018-08-23 16:26:25 +08:00
Adam Hill 797a9213e4
Adding helpful comment for copy paste to Dockerhub/Store 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 19:46:12 -05:00
Adam Hill c56385ad49
remove multiarch and comments from readme (dockerhub does not high comments) 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 19:43:05 -05:00
Adam Hill 5cc28d769a
Updated deploy script (still needs work), fixed dead link 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 19:33:45 -05:00
Adam Hill 5ee2cc947c
Better writing for second half of 443 sinkhold section 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 15:17:06 -05:00
Adam Hill 1c063a6619
change password interactively to avoid leaving bash history 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 15:08:24 -05:00
Adam Hill df63b3ee12
image to top, links fix, better writing for 443 sinkhole 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 15:04:35 -05:00
Adam Hill 3c135774d3
image to html the same as main repo's 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 14:55:08 -05:00
Adam Hill c8d7abed1b
image, theirs=ours, dockers=docker containers 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 14:52:08 -05:00
Adam Hill a257be134d
Typo, "Pi-hole" consistantly 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 14:43:56 -05:00
Adam Hill 7b06920cd0
travis link fix 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 14:36:34 -05:00
Adam Hill 1f49971046
multiarch reference removed 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 14:34:26 -05:00
Adam Hill a4296416b0
readme updates 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 14:28:33 -05:00
Adam Hill 6e15abd002
more readme old debian tags 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 12:06:51 -05:00
Adam Hill 805c5ccdb7
more /diginc/ references updated 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-08-04 11:44:24 -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 43aa8f45d8
armel readme update 
Signed-off-by: Adam Hill <adam@diginc.us>
 2018-07-16 23:54:52 -05:00
diginc 1b96d7e760 Merge branch 'dev' of github.com:diginc/docker-pi-hole into more_ports 2018-07-10 23:14:27 -05:00
diginc 6364640d4f readme updates 2018-07-10 23:11:44 -05:00
StefanSchoof 3171feef4c allow no for DNS2 2018-07-06 08:01:41 +00:00
diginc cd6f2790bd Merge branch 'dev' of github.com:diginc/docker-pi-hole into dev 2018-07-05 20:51:20 -05:00
Claudio Ramirez d12a876f8f typo 2018-05-08 21:07:50 +02:00
Claudio Ramirez e10a200d70 fmt 2018-05-04 17:17:53 +02:00
Claudio Ramirez 17b3781dd4 Safe workaround for slow loading pages (scripts that make SSL connections to blocked domains) 2018-05-04 17:16:49 +02:00
Adam Hill aaad7c8981
Update README.md 2018-04-21 12:47:22 -05:00
Adam Hill bc54868f80
Merge branch 'master' into patch-2 2018-04-05 14:58:41 -05:00
Ted Timmons d8fdd4bacc
copyedit, round two 
more copyedits.
 2018-04-05 09:42:24 -07:00
Ted Timmons 9bb4a2daf5
quick readability edits 
lots of spelling fixes, add a second header so it doesn't blend together
 2018-04-05 09:19:54 -07:00
Adam Hill b0fac9576e
Update README.md 2018-01-11 09:04:57 -06:00
Adam Hill 2cf778f423
Update README.md 2018-01-10 14:12:46 -06:00
Adam Hill feee2a2356
Update README.md 2018-01-10 14:08:37 -06:00
Adam Hill 84eef29f6d
README updates 
Make the image tag changes more visible
 2018-01-10 14:04:23 -06:00
ASuarez27 cb3a6e1ac8
Update README.md 
ARM tag was incorrect should be debian_armhf per docker hub tags
 2018-01-08 23:31:14 -05:00
oscarnyl 813c725636
Mistake 2018-01-07 11:08:19 +01:00
oscarnyl 0eefb76fca
Document changes to how to use ARM images 2018-01-07 11:04:18 +01:00
diginc 615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc fd4e123ca2 README and small variable update 2017-11-14 22:46:17 -06:00
Phil Helm 83ef38c8f7
escape a pipe character which was breaking a table 2017-11-02 09:40:09 +00:00
Adam Hill 92a65df3bb Update README.md 2017-10-26 17:13:15 -05:00
Tony Brobston ac6e1cdc5a Update README.md 2017-10-26 16:48:35 -05:00
Erik Hummel d8c72ab175 Minor formatting changes 
Correctly highlight `docker exec` commands in the Pihole features list.
 2017-10-16 17:13:50 -07:00
Adam Hill c40d23246a Update README.md 2017-06-23 11:27:58 -05:00
diginc 48d5f101a9 missing space 2017-05-29 14:02:28 -05:00
diginc e290d969d8 updating docs 2017-05-29 13:59:03 -05:00
Tom Moore e2879d4331 Added systemd service file and included instructions on it's use 2017-05-24 10:16:56 -04:00