docker/docker-pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/docker-pi-hole.git synced 2024-06-26 09:09:07 +02:00
Code Issues Releases Wiki Activity
1,312 Commits 10 Branches 115 Tags 4.7 MiB
c4542d651d
Commit Graph

1312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Warner
0baf7b63d9
Merge pull request #976 from pi-hole/new/bullseye 
Switch base image from Buster to Bullseye
 2022-01-08 13:40:45 +00:00
Adam Warner
5e79db52ab
This does not appear to be an issue on bullseye - tested with the same command's listed here https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923479, but switched out buster for bullseye. Confirmed I was able to repro the buster issue on docker desktop for windows 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 13:26:11 +00:00
Adam Warner
0018e46a28
Bullseye anyone? 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-08 12:55:54 +00:00
Adam Warner
25a8e0dcba
Merge pull request #970 from AlexanderLieret/patch-webtheme 
Update list of available web themes
 2022-01-07 23:46:07 +00:00
Adam Warner
74707b576c
Merge pull request #973 from pi-hole/tweak/serviceMonkeyPatch 
Prevent logspam when restarting FTL (Error from kill command)
 2022-01-07 23:20:42 +00:00
Adam Warner
9deb685cc0
When restarting the service - wait until the old proc has been killed before attempting to start it again. Prevents messages about the usuage of kill in the log. 
Remove old comment

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-07 23:14:28 +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
Adam Warner
4cc3587084
adjustment to custom interface tests to reflect new default behaviour in https://github.com/pi-hole/pi-hole/pull/4509 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-05 22:47:16 +00:00
Adam Warner
2567ab9940
only chown/chmod pihole-FTL.db if it exists 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-05 21:47:25 +00:00
Adam Warner
6b29503dd0
Tweak fix_capabilites output 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-05 19:37:13 +00:00
Adam Warner
806f734cdc
Remove shim now that it is in the core repo https://github.com/pi-hole/pi-hole/pull/4515 (#965) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-04 21:46:18 +00:00
Adam Warner
2c6bc33e8d
Increase verbosity of error message when capabilities cannot be set - add note to readme about default DNSMASQ_USER. See #963 for details (#964) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-04 18:50:37 +00:00
Adam Warner
2a7ea09d00
Readme tweaks 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 15:54:09 +00:00
Adam Warner
a5eda6844e
use kill -15 (TERM) instead of 9 to exit FTL a bit more gracefully and save queries to the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:30:31 +00:00
Adam Warner
44bdfc1438
bump s6 to latest 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:30:06 +00:00
Adam Warner
0eb1a60d78
Switch default DNSMASQ_USER to pihole from root, and fix permissions on pihole-FTL.db to belong to pihole:pihole 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 14:29:54 +00:00
Adam Warner
8ea5f9c8dc
Add CAP_SYS_NICE,CAP_CHOWN, and CAP_IPC_LOCK to the fix_capabilities() function 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2022-01-02 13:05:05 +00:00
Martin F. Schumann
2dde4a64c9
replace php env configuration lines if they are already present instead of adding them always (#952) (#957) 
Signed-off-by: Martin Schumann <mfs@mfs.name>
 2021-12-28 22:20:32 +00:00
Adam Warner
3f97e6e4fc
Only use branch ref for tag if we're not building via schedule event (namely, don;t also tag "master" when doing nightly) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-25 13:38:10 +00:00
Phill
b0a5a0f163
Trailing slashes on volumes fail on newer versions of docker-compose (#949) 
* Trailing slashes on volumes fail on newer versions of docker-compose

See [Issue 947](https://github.com/pi-hole/docker-pi-hole/issues/947)
for the background.

This PR proposes removing trailing slashes from all documentation,
examples and scripts.

Signed-off-by: Phill Kelley <pmk.57t49@lgosys.com>
 2021-12-11 13:37:18 +00:00
Adam Warner
523762e47d
scream test: removing linux/ppc64le as there are build errors - unsure if anyone is _actually_ using this in any case. I guess we'll find out... 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-12-11 00:21:51 +00:00
Adam Warner
7848d06325
Switch base from debian:buster-slim to ghcr.io/pi-hole/docker-pi-hole-base:buster-slim, which is updated weekly and should speed up build times on this end 2021-12-11 00:20:04 +00:00
Adam Warner
54ca7e9ce4
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into dev 2021-12-10 20:51:51 +00:00