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

armbian-next: docker: don't bomb if stdin is not a terminal (eg, in CI)

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-21 18:58:33 +01:00
parent d95478281b
commit d4f969c67d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/functions/host/docker.sh
View File

@@ -395,6 +395,13 @@ function docker_cli_prepare_launch() {
display_alert "Skipping /dev/loop* hacks for" "${DOCKER_ARMBIAN_HOST_OS_UNAME}" "debug" display_alert "Skipping /dev/loop* hacks for" "${DOCKER_ARMBIAN_HOST_OS_UNAME}" "debug"
fi fi
if [[ -t 0 ]]; then
display_alert "Running in a terminal" "passing through stdin" "debug"
DOCKER_ARGS+=("-it")
else
display_alert "Not running in a terminal" "not passing through stdin to Docker" "warn" # @TODO downgrade to debug after probe works
fi
# if DOCKER_EXTRA_ARGS is an array and has more than zero elements, add its contents to the DOCKER_ARGS array # if DOCKER_EXTRA_ARGS is an array and has more than zero elements, add its contents to the DOCKER_ARGS array
if [[ "${DOCKER_EXTRA_ARGS[*]+isset}" == "isset" && "${#DOCKER_EXTRA_ARGS[@]}" -gt 0 ]]; then if [[ "${DOCKER_EXTRA_ARGS[*]+isset}" == "isset" && "${#DOCKER_EXTRA_ARGS[@]}" -gt 0 ]]; then
display_alert "Adding extra Docker arguments" "${DOCKER_EXTRA_ARGS[*]}" "debug" display_alert "Adding extra Docker arguments" "${DOCKER_EXTRA_ARGS[*]}" "debug"
@@ -419,7 +426,7 @@ function docker_cli_launch() {
display_alert "-----------------Relaunching in Docker------------------------------------" "here comes the 🐳" "info" display_alert "-----------------Relaunching in Docker------------------------------------" "here comes the 🐳" "info"
local -i docker_build_result local -i docker_build_result
if docker run -it "${DOCKER_ARGS[@]}" "${DOCKER_ARMBIAN_INITIAL_IMAGE_TAG}" /bin/bash "${DOCKER_ARMBIAN_TARGET_PATH}/compile.sh" "$@"; then if docker run "${DOCKER_ARGS[@]}" "${DOCKER_ARMBIAN_INITIAL_IMAGE_TAG}" /bin/bash "${DOCKER_ARMBIAN_TARGET_PATH}/compile.sh" "$@"; then
docker_build_result=$? # capture exit code of test done in the line above. docker_build_result=$? # capture exit code of test done in the line above.
display_alert "-------------Docker run finished------------------------------------------" "successfully" "info" display_alert "-------------Docker run finished------------------------------------------" "successfully" "info"
else else