Adam Warner
d46a1e3356
Merge pull request #1014 from haxwithaxe/support-docker-links-for-PIHOLE_DNS_dev
...
Support docker service names and links for PIHOLE_DNS_
2022-03-16 15:30:43 +00: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
e4a1abb5fb
Added docker service name info to PIHOLE_DNS_ section.
...
Signed-off-by: haxwithaxe <spam@haxwithaxe.net>
2022-03-13 22:40:56 -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
e6cde29cc1
Merge pull request #1005 from PeterDaveHelloKitchen/fix-README.md
...
Fix typo in README.md "Optional Variables" (IPv6)
2022-02-19 15:54:03 +00:00
Peter Dave Hello
e459169d8a
Fix typo in README.md "Optional Variables" (IPv6)
2022-02-16 17:13:39 +08:00
Adam Warner
1b35e7fdd4
Merge pull request #1003 from pi-hole/revert-to-buster
...
Revert base image to buster, we can try bullseye again later, there are a couple of teething issues
2022-02-12 22:56:27 +00:00
Adam Warner
90f4ebe882
revert base image to buster, we can try bullseye again later
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-02-12 22:48:58 +00:00
Adam Warner
6b5f746a15
Merge pull request #999 from pi-hole/master
...
sync: master to dev
2022-02-12 12:30:12 +00:00
Adam Warner
2a705ecfe9
Add investigating label to ignore list
2022-02-12 11:18:34 +00:00
Adam Warner
5b41b63fa0
Merge pull request #997 from rdwebdesign/alert_branch
...
Adding text message asking to select "dev" branch on new PR
2022-02-08 15:15:08 +00:00
Adam Warner
0a7427371e
Merge pull request #996 from rdwebdesign/add_TZ_env
...
Adding `TZ` var to PHP environment
2022-02-08 15:14:03 +00:00
RD WebDesign
5efcd88b20
Text message asking to select "dev" branch on new PR
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-02-07 16:47:59 -03:00
RD WebDesign
fd0b9bf9d3
Adding `TZ` var to PHP environment
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2022-02-06 17:38:15 -03:00
Adam Warner
a42f67f5ee
Merge pull request #994 from sebastiansterk/patch-1
...
make prerequisites more precise
2022-02-04 21:29:47 +00:00
Adam Warner
89b03445a1
Merge pull request #992 from pi-hole/master
...
sync: master to dev
2022-02-04 21:28:37 +00:00
Adam Warner
13c81a9091
Merge pull request #990 from edgd1er/dev_origin
...
[Experimental] Add ability to Redirect lighttpd logs to stdout
2022-02-04 19:40:32 +00:00
Sebastian Sterk
3d6f53899f
make prerequisites more precise
2022-02-01 00:17:59 +01:00
Adam Warner
69d4349bbb
Create dco.yml
2022-01-28 10:19:44 +00:00
Adam Warner
1d51da7f47
Create release.yml
2022-01-28 10:18:50 +00:00
Adam Warner
351b9a7f85
Create sync-back-to-dev.yml
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-28 10:18:16 +00:00
Adam Warner
19bb9dcc2f
use label `stale` on stale issues instead of `Submitter attention required`, which doesn't always make sense
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-28 10:15:49 +00:00
edgd1er
2db09515d7
add suggested changes to send logs to stdout
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2022-01-28 08:12:40 +01:00
edgd1er
06d6b74c63
add finish scripts for logs. prevent duplicate cat processes, lighttpd start loop
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2022-01-27 05:49:59 +01:00
edgd1er
140312b79c
Redirect lighttpd logs to stdout
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2022-01-27 04:17:42 +01:00
Adam Warner
e6dd028c61
switch from -wU to -wu, as there is nothing set up to notify that the daemon's are ready - effectively supresses a warning message that we don't need to pay attention to
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-26 21:41:17 +00:00
Adam Warner
1f3951431b
tweak per https://github.com/pi-hole/docker-pi-hole/pull/991#pullrequestreview-864021964
2022-01-26 21:06:17 +00:00
Adam Warner
a29faad9df
Merge pull request #991 from pi-hole/tweak/lighttpd-run
...
Touch/chown lighttpd access/error logs on service start
2022-01-26 18:30:49 +00:00
Adam Warner
2eb9afc350
Touch/chown lighttpd access/error logs on service start. May not be 100% neccasery currently, but could be useful
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-26 18:29:14 +00:00
Adam Warner
25539a9c99
Merge pull request #982 from edgd1er/dev_origin
...
[Experimental] Add ability to change UID / GID for www-data and pihole user.
2022-01-20 17:16:04 +00:00
Adam Warner
778e993903
Move variable description to the Experimental section
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-20 17:12:18 +00:00
Adam Warner
510ca0b873
rechown /opt/pihole and pihole command in case of UID changing
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-20 17:10:19 +00:00
Adam Warner
eed203530e
while I'm in here - drop S6 overlay version per https://github.com/just-containers/s6-overlay/issues/329
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-17 23:28:37 +00:00
Adam Warner
fe1676b9ed
Move a few things about. Set permissions pihole-FT requires in it's `run` script. remove pihole-FTL test from test-config because nothing exists until it has started for the first time.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-17 23:28:02 +00:00
Adam Warner
c2870031e3
Merge pull request #987 from PeterDaveHelloKitchen/fix-#986
...
Use consistent method to kill process in s6 finish script
2022-01-17 22:03:36 +00:00
edgd1er
0ecde45d22
removed vars in compose sample.
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2022-01-17 15:28:25 +01:00
edgd1er
2cec4fa719
change UID / GID for www-data and pihole user.
...
When mounting volumes, specific rights may be needed to write on mounted volumes on the host.
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2022-01-17 15:28:25 +01:00
Peter Dave Hello
b29ac1ec18
Use consistent method to kill process in s6 finish script
...
If the process does not exist, the error message of `kill` command is a
little bit confusing:
`kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]`
Using `killall` in `/s6/debian-root/etc/services.d/pihole-FTL/finish` to
kill the process, like what we do in `cron/finish` & `lighttpd/finish`,
will make the usage in this project more consistent, and also, the
command `killall` will provide better & friendly output, like:
`pihole-FTL: no process found`
Close #986 , cc #973
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org>
2022-01-17 22:19:23 +08:00
Adam Warner
0a20ef8955
Merge pull request #988 from pi-hole/master
...
sync `dev` to `master`
2022-01-17 13:04:28 +00:00
Adam Warner
13a3da65c8
Update stale.yml
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-12 09:17:26 +00:00
Adam Warner
b901a899ae
add never-stale and bug labels to exemptions
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-11 19:11:51 +00: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
6262433f4d
Merge pull request #981 from pi-hole/new/PIHOLE_DNS_-source-of-truth
...
If PIHOLE_DNS_ env var is employed, use that as source of truth
2022-01-09 21:24:10 +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
Adam Warner
2fb2202a17
Sync the minimal docker-compose examples. Remove note about pihole.log, it isn't neccasery ( https://github.com/pi-hole/docker-pi-hole/issues/809 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-09 19:04:19 +00:00
Adam Warner
c6e859723c
Merge pull request #978 from pi-hole/fix-2567a9b
...
Don't attempt to chmod pihole-FTL.db if it does not exist
2022-01-08 17:31:52 +00:00
Adam Warner
69e9272a91
Missed a reference removal in 2567ab9940
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-08 17:30:22 +00:00
Adam Warner
6e9790870c
Use stale action from core repo to manage stale issues
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-08 17:18:04 +00:00