JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

track input nice value, propagate to docker

Browse Source
This commit is contained in:
tabris
2025-09-05 03:16:20 -04:00
committed by Igor
parent c4a7a4a766
commit b405bc8415
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/functions/cli/cli-docker.sh
View File

@@ -65,6 +65,9 @@ function cli_docker_run() {
ARMBIAN_CLI_RELAUNCH_PARAMS+=(["SET_OWNER_TO_UID"]="${EUID}") # fix the owner of files to our UID
ARMBIAN_CLI_RELAUNCH_PARAMS+=(["ARMBIAN_BUILD_UUID"]="${ARMBIAN_BUILD_UUID}") # pass down our uuid to the docker instance
ARMBIAN_CLI_RELAUNCH_PARAMS+=(["SKIP_LOG_ARCHIVE"]="yes") # launched docker instance will not cleanup logs.
if [[ -n "${DOCKER_NICE:-}" ]]; then
ARMBIAN_CLI_RELAUNCH_PARAMS+=(["DOCKER_NICE"]="${DOCKER_NICE}") # propagated `nice` value
fi
# Produce the re-launch params.
declare -g ARMBIAN_CLI_FINAL_RELAUNCH_ARGS=()

32
lib/functions/cli/entrypoint.sh
View File

@@ -79,6 +79,38 @@ function cli_entrypoint() {
armbian_cli_pre_run_command
done
declare -g DOCKER_NICE
if [[ "$ARMBIAN_COMMAND" == "docker" ]] || \
[[ -n "${ARMBIAN_PARSED_CMDLINE_PARAMS["PREFER_DOCKER"]}" && "${ARMBIAN_PARSED_CMDLINE_PARAMS["PREFER_DOCKER"]}" == "yes" ]] || \
[[ -n "${ARMBIAN_PARSED_CMDLINE_PARAMS["DOCKER_NICE"]}" ]]; then
CURRENT_NICE=$(($(ps -p $$ -o 'nice=')+0))
# by default, docker sets up a separate environment that inherits next to nothing.
# this detects the current process nice value and attempts to propagate it.
if [[ -z "${ARMBIAN_PARSED_CMDLINE_PARAMS["DOCKER_NICE"]}" ]]; then
# since it's not been passed to us in our invocation, use our current nice value
# this becomes a propagated cmdline parameter in cli-docker.sh
DOCKER_NICE=$CURRENT_NICE
display_alert "Niceness parameter (DOCKER_NICE)" "$DOCKER_NICE" "debug"
else
# initialize from passed cmdline arg
DOCKER_NICE="${ARMBIAN_PARSED_CMDLINE_PARAMS["DOCKER_NICE"]}"
# we cast DOCKER_NICE to integer in case we were handed garbage.
DOCKER_NICE=$(("$DOCKER_NICE"+0))
fi
if [[ $CURRENT_NICE -ne $DOCKER_NICE ]]; then
# enforce the niceness
if [[ $UID -eq 0 ]]; then # don't bother if we're not root
# Given we run as root in docker, we shouldn't worry about lacking permissions.
# if it's an invalid integer value, then we can feel secure in letting it fail.
renice -n $DOCKER_NICE -p $$ && \
display_alert "enforced nice value (DOCKER_NICE)" "$DOCKER_NICE" "debug" || \
display_alert "renice failed" "FAILED" "warn"
fi
fi
fi
# IMPORTANT!!!: it is INVALID to relaunch compile.sh from here. It will cause logging mistakes.
# So the last possible moment to relaunch is in xxxxx_pre_run!
# Also form here, UUID will be generated, output created, logging enabled, etc.