Take a leaf from the bare metal pihole-FTL service and introduce a wrapper to mimic this functionality (much like we currently do in the v5 container)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
parent
27b4c8a1bf
commit
2aabc4c502
|
@ -69,6 +69,7 @@ RUN cd /etc/.pihole && \
|
||||||
|
|
||||||
COPY --chmod=0755 bash_functions.sh /usr/bin/bash_functions.sh
|
COPY --chmod=0755 bash_functions.sh /usr/bin/bash_functions.sh
|
||||||
COPY --chmod=0755 start.sh /usr/bin/start.sh
|
COPY --chmod=0755 start.sh /usr/bin/start.sh
|
||||||
|
COPY --chmod=0755 service /usr/local/bin/service
|
||||||
|
|
||||||
HEALTHCHECK CMD dig +short +norecurse +retry=0 @127.0.0.1 pi.hole || exit 1
|
HEALTHCHECK CMD dig +short +norecurse +retry=0 @127.0.0.1 pi.hole || exit 1
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,109 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
# This script patches all service commands into the appropriate s6- commands
|
||||||
|
# pi-hole upstream scripts need a 'service' interface. why not systemd? docker said so.
|
||||||
|
|
||||||
|
# Source utils.sh for getFTLPIDFile(), getFTLPID()
|
||||||
|
PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
||||||
|
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
|
||||||
|
# shellcheck disable=SC1090
|
||||||
|
. "${utilsfile}"
|
||||||
|
|
||||||
|
is_running() {
|
||||||
|
if [ -d "/proc/${FTL_PID}" ]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup() {
|
||||||
|
# Run post-stop script, which does cleanup among runtime files
|
||||||
|
sh "${PI_HOLE_SCRIPT_DIR}/pihole-FTL-poststop.sh"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Start the service
|
||||||
|
start() {
|
||||||
|
if is_running; then
|
||||||
|
echo "pihole-FTL is already running"
|
||||||
|
else
|
||||||
|
# Run pre-start script, which pre-creates all expected files with correct permissions
|
||||||
|
sh "${PI_HOLE_SCRIPT_DIR}/pihole-FTL-prestart.sh"
|
||||||
|
capsh --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null" &
|
||||||
|
|
||||||
|
rc=$?
|
||||||
|
# Cleanup if startup failed
|
||||||
|
if [ "${rc}" != 0 ]; then
|
||||||
|
cleanup
|
||||||
|
exit $rc
|
||||||
|
fi
|
||||||
|
echo
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Stop the service
|
||||||
|
stop() {
|
||||||
|
if is_running; then
|
||||||
|
kill "${FTL_PID}"
|
||||||
|
for i in 1 2 3 4 5; do
|
||||||
|
if ! is_running; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf "."
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
echo
|
||||||
|
|
||||||
|
if is_running; then
|
||||||
|
echo "Not stopped; may still be shutting down or shutdown may have failed, killing now"
|
||||||
|
kill -9 "${FTL_PID}"
|
||||||
|
else
|
||||||
|
echo "Stopped"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Not running"
|
||||||
|
fi
|
||||||
|
cleanup
|
||||||
|
echo
|
||||||
|
}
|
||||||
|
|
||||||
|
# Indicate the service status
|
||||||
|
status() {
|
||||||
|
if is_running; then
|
||||||
|
echo "[ ok ] pihole-FTL is running"
|
||||||
|
exit 0
|
||||||
|
else
|
||||||
|
echo "[ ] pihole-FTL is not running"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Get FTL's PID file path
|
||||||
|
FTL_PID_FILE="$(getFTLPIDFile)"
|
||||||
|
|
||||||
|
# Get FTL's current PID
|
||||||
|
FTL_PID="$(getFTLPID "${FTL_PID_FILE}")"
|
||||||
|
|
||||||
|
if [ "$1" != "pihole-FTL" ]; then
|
||||||
|
# do something
|
||||||
|
echo "Service Wrapper only used for pihole-FTL in this docker container"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
case "$2" in
|
||||||
|
stop)
|
||||||
|
stop
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
status
|
||||||
|
;;
|
||||||
|
start|restart|reload|condrestart)
|
||||||
|
stop
|
||||||
|
start
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: $0 {start|stop|restart|reload|status}"
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit 0
|
16
src/start.sh
16
src/start.sh
|
@ -131,10 +131,8 @@ start() {
|
||||||
|
|
||||||
pihole updatechecker
|
pihole updatechecker
|
||||||
|
|
||||||
# Start pihole-FTL
|
# Start pihole-FTL using the service-wrapper at /usr/local/bin/service
|
||||||
|
service pihole-FTL start
|
||||||
sh /opt/pihole/pihole-FTL-prestart.sh
|
|
||||||
capsh --user=$DNSMASQ_USER --keep=1 -- -c "/usr/bin/pihole-FTL $FTL_CMD >/dev/null" &
|
|
||||||
|
|
||||||
if [ "${TAIL_FTL_LOG:-1}" -eq 1 ]; then
|
if [ "${TAIL_FTL_LOG:-1}" -eq 1 ]; then
|
||||||
tail -f /var/log/pihole/FTL.log &
|
tail -f /var/log/pihole/FTL.log &
|
||||||
|
@ -152,14 +150,8 @@ start() {
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
# Ensure pihole-FTL shuts down cleanly on SIGTERM/SIGINT
|
# Stop pihole-FTL using the service-wrapper at /usr/local/bin/service
|
||||||
ftl_pid=$(pgrep pihole-FTL)
|
service pihole-FTL stop
|
||||||
killall --signal 15 pihole-FTL
|
|
||||||
|
|
||||||
# Wait for pihole-FTL to exit
|
|
||||||
while test -d /proc/"${ftl_pid}"; do
|
|
||||||
sleep 0.5
|
|
||||||
done
|
|
||||||
|
|
||||||
# If we are running pytest, keep the container alive for a little longer
|
# If we are running pytest, keep the container alive for a little longer
|
||||||
# to allow the tests to complete
|
# to allow the tests to complete
|
||||||
|
|
Loading…
Reference in New Issue