docker
/
docker-pi-hole
mirror of https://github.com/pi-hole/docker-pi-hole.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh 

The capabilities are already set there, so they do not need to be set again here.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner 2022-11-27 22:35:31 +00:00
parent 7b80d7de66
commit a0421789cc
No known key found for this signature in database
GPG Key ID: 872950F3ECF2B173
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/run
View File

@ -38,8 +38,7 @@ if [ ! -f /var/log/pihole-FTL.log ]; then
chown -h pihole:pihole /var/log/pihole-FTL.log
fi
# Call capsh with the detected capabilities
capsh --inh=${CAP_STR:1} --addamb=${CAP_STR:1} --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null 2>&1"
capsh --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null 2>&1"
# Notes on above:
# - DNSMASQ_USER default of pihole is in Dockerfile & can be overwritten by runtime container env