Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

scripts/util/docker/docker.sh: Fix trap failing if docker process or subprocesses have already been killed or not found

This commit is contained in:
agnostic-apollo 2022-09-13 07:41:29 +08:00 committed by Uchiha Kakashi
parent 8134416035
commit 7a1e0164ee
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/utils/docker/docker.sh
View File

@ -42,16 +42,18 @@ docker_killtree() {
local signal="${1-}"; local pid="${2-}"; local cpid; local docker_process
for cpid in $(pgrep -P "$pid"); do docker_killtree "$signal" "$cpid"; done
[[ "$pid" != "$$" ]] && \
docker_process="$(ps -efww --pid "$pid" --no-headers -o pid:1,cmd)" && \
#echo "Killing $docker_process" && \
docker_process="$(ps -efww --pid "$pid" --no-headers -o pid:1,cmd || :)" && \
test -n "$docker_process" && \
#echo "Killing $docker_process" && \
kill "-${signal:=15}" "$pid" 2>/dev/null || :
}
# Read the pid stored in file path and send kill signals to the process and all its children
DOCKER_PID="$(cat '"$DOCKER_EXEC_PID_FILE_PATH"')" && [[ "$DOCKER_PID" =~ ^[0-9]+$ ]] && \
DOCKER_PROCESS="$(ps -efww --pid "$DOCKER_PID" --no-headers -o pid:1,cmd)" && \
echo "Docker trap killing $DOCKER_PROCESS" && \
docker_killtree "'"$signal"'" "$DOCKER_PID"
DOCKER_PROCESS="$(ps -efww --pid "$DOCKER_PID" --no-headers -o pid:1,cmd || :)" && \
test -n "$DOCKER_PROCESS" && \
echo "Docker trap killing DOCKER_PROCESS" && \
docker_killtree "'"$signal"'" "$DOCKER_PID" || :
'
# Exec docker_exec_trap_command inside docker context
$SUDO docker exec "$CONTAINER_NAME" bash -c "$docker_exec_trap_command"