mirror of
https://github.com/termux/termux-packages
synced 2024-06-15 00:58:35 +00:00
7b9b9b6224
If `--tty` is not passed to `docker exec` because stdout is not available (`[ ! -t 1 ]`), like due to redirection to file (`&> build.log`) or if stdin is not available (`< /dev/null`), then docker does not forward kill signals to the process started and they remain running. To fix the issue, the `DOCKER_EXEC_PID_FILE_PATH` env variable with the value `/tmp/docker-exec-pid-<timestamp>` is passed to the process called with `docke exec` and the process started stores its pid in the file path passed. Traps are set in `run-docker.sh` that runs the `docker exec` command to receive any kills signals, and if it does, it runs another `docker exec` command to read the pid of the process previously started from `DOCKER_EXEC_PID_FILE_PATH` and then kills it and all its children. See Also: https://github.com/docker/cli/issues/2607 https://github.com/moby/moby/issues/9098 https://github.com/moby/moby/pull/41548 https://stackoverflow.com/questions/41097652/how-to-fix-ctrlc-inside-a-docker-container Also passing `--init` to `docker run` to "Run an init inside the container that forwards signals and reaps processes", although it does not work for above cases, but may helpful in others. The `--init` flag changes will only engage on new container creation. https://docs.docker.com/engine/reference/run/#specify-an-init-process https://docs.docker.com/engine/reference/commandline/run/ ``` ./scripts/run-docker.sh ./build-package.sh -f libjpeg-turbo &> build.log ^C $ ./scripts/run-docker.sh ps -efww Running container 'termux-package-builder' from image 'termux/package-builder'... UID PID PPID C STIME TTY TIME CMD builder 1 0 0 05:48 pts/0 00:00:00 bash builder 9243 0 0 06:01 pts/1 00:00:00 bash builder 28127 0 0 06:12 ? 00:00:00 /bin/bash ./build-package.sh -f libjpeg-turbo builder 28141 28127 0 06:12 ? 00:00:00 /bin/bash ./build-package.sh -f libjpeg-turbo builder 28449 28141 1 06:12 ? 00:00:00 ninja -w dupbuild=warn -j 8 builder 28656 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28657 28656 79 06:12 ? 00:00:01 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28694 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28695 28694 89 06:12 ? 00:00:00 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28728 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28729 28728 0 06:12 ? 00:00:00 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28731 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28734 28731 0 06:12 ? 00:00:00 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28740 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28741 28740 0 06:12 ? 00:00:00 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28744 0 0 06:12 pts/2 00:00:00 ps -efww builder 28748 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28752 28748 0 06:12 ? 00:00:00 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28753 28449 0 06:12 ? 00:00:00 /bin/sh -c /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28754 28753 0 06:12 ? 00:00:00 /home/builder/.termux-build/_cache/android-r23c-api-24-v0/bin/clang builder 28755 28449 0 06:12 ? 00:00:00 ninja -w dupbuild=warn -j 8 $ ./scripts/run-docker.sh ./build-package.sh -f libjpeg-turbo &> build.log $ ./scripts/run-docker.sh ./build-package.sh -f libjpeg-turbo Running container 'termux-package-builder' from image 'termux/package-builder'... ERROR: Another build is already running within same environment. ```
75 lines
2.3 KiB
Bash
Executable File
75 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
set -e -u
|
|
|
|
TERMUX_SCRIPTDIR=$(cd "$(realpath "$(dirname "$0")")"; cd ..; pwd)
|
|
|
|
CONTAINER_HOME_DIR=/home/builder
|
|
UNAME=$(uname)
|
|
if [ "$UNAME" = Darwin ]; then
|
|
# Workaround for mac readlink not supporting -f.
|
|
REPOROOT=$PWD
|
|
SEC_OPT=""
|
|
else
|
|
REPOROOT="$(dirname $(readlink -f $0))/../"
|
|
SEC_OPT=" --security-opt seccomp=$REPOROOT/scripts/profile.json"
|
|
fi
|
|
|
|
# Required for Linux with SELinux and btrfs to avoid permission issues, eg: Fedora
|
|
# To reset, use "restorecon -Fr ."
|
|
# To check, use "ls -Z ."
|
|
if [ -n "$(command -v getenforce)" ] && [ "$(getenforce)" = Enforcing ]; then
|
|
VOLUME=$REPOROOT:$CONTAINER_HOME_DIR/termux-packages:z
|
|
else
|
|
VOLUME=$REPOROOT:$CONTAINER_HOME_DIR/termux-packages
|
|
fi
|
|
|
|
: ${TERMUX_BUILDER_IMAGE_NAME:=ghcr.io/termux/package-builder}
|
|
: ${CONTAINER_NAME:=termux-package-builder}
|
|
|
|
USER=builder
|
|
|
|
if [ -n "${TERMUX_DOCKER_USE_SUDO-}" ]; then
|
|
SUDO="sudo"
|
|
else
|
|
SUDO=""
|
|
fi
|
|
|
|
echo "Running container '$CONTAINER_NAME' from image '$TERMUX_BUILDER_IMAGE_NAME'..."
|
|
|
|
# Check whether attached to tty and adjust docker flags accordingly.
|
|
if [ -t 1 ]; then
|
|
DOCKER_TTY=" --tty"
|
|
else
|
|
DOCKER_TTY=""
|
|
fi
|
|
|
|
$SUDO docker start $CONTAINER_NAME >/dev/null 2>&1 || {
|
|
echo "Creating new container..."
|
|
$SUDO docker run \
|
|
--detach \
|
|
--init \
|
|
--name $CONTAINER_NAME \
|
|
--volume $VOLUME \
|
|
$SEC_OPT \
|
|
--tty \
|
|
$TERMUX_BUILDER_IMAGE_NAME
|
|
if [ "$UNAME" != Darwin ]; then
|
|
if [ $(id -u) -ne 1001 -a $(id -u) -ne 0 ]; then
|
|
echo "Changed builder uid/gid... (this may take a while)"
|
|
$SUDO docker exec $DOCKER_TTY $CONTAINER_NAME sudo chown -R $(id -u) $CONTAINER_HOME_DIR
|
|
$SUDO docker exec $DOCKER_TTY $CONTAINER_NAME sudo chown -R $(id -u) /data
|
|
$SUDO docker exec $DOCKER_TTY $CONTAINER_NAME sudo usermod -u $(id -u) builder
|
|
$SUDO docker exec $DOCKER_TTY $CONTAINER_NAME sudo groupmod -g $(id -g) builder
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# Set traps to ensure that the process started with docker exec and all its children are killed.
|
|
. "$TERMUX_SCRIPTDIR/scripts/utils/docker/docker.sh"; docker__setup_docker_exec_traps
|
|
|
|
if [ "$#" -eq "0" ]; then
|
|
$SUDO docker exec --env "DOCKER_EXEC_PID_FILE_PATH=$DOCKER_EXEC_PID_FILE_PATH" --interactive $DOCKER_TTY $CONTAINER_NAME bash
|
|
else
|
|
$SUDO docker exec --env "DOCKER_EXEC_PID_FILE_PATH=$DOCKER_EXEC_PID_FILE_PATH" --interactive $DOCKER_TTY $CONTAINER_NAME "$@"
|
|
fi
|