enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation within docker-shell

Browse Source
This commit is contained in:
Gunjan Gupta 2024-02-01 20:10:33 +05:30
parent 8eab8fd19b
commit 7b81255a5f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,17 @@ function cli_docker_run() {
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.
# Produce the re-launch params.
declare -g ARMBIAN_CLI_FINAL_RELAUNCH_ARGS=()
declare -g ARMBIAN_CLI_FINAL_RELAUNCH_ENVS=()
produce_relaunch_parameters # produces ARMBIAN_CLI_FINAL_RELAUNCH_ARGS and ARMBIAN_CLI_FINAL_RELAUNCH_ENVS
# Add the relaunch envs to DOCKER_ARGS.
for env in "${ARMBIAN_CLI_FINAL_RELAUNCH_ENVS[@]}"; do
display_alert "Adding Docker env" "${env}" "debug"
DOCKER_ARGS+=("--env" "${env}")
done
case "${DOCKER_SUBCMD}" in
shell)
display_alert "Launching Docker shell" "docker-shell" "info"

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

@ -568,17 +568,6 @@ function docker_cli_launch() {
run_host_command_logged find "${SRC}/userpatches" -name ".DS_Store" -type f -delete "||" true
fi
# Produce the re-launch params.
declare -g ARMBIAN_CLI_FINAL_RELAUNCH_ARGS=()
declare -g ARMBIAN_CLI_FINAL_RELAUNCH_ENVS=()
produce_relaunch_parameters # produces ARMBIAN_CLI_FINAL_RELAUNCH_ARGS and ARMBIAN_CLI_FINAL_RELAUNCH_ENVS
# Add the relaunch envs to DOCKER_ARGS.
for env in "${ARMBIAN_CLI_FINAL_RELAUNCH_ENVS[@]}"; do
display_alert "Adding Docker env" "${env}" "debug"
DOCKER_ARGS+=("--env" "${env}")
done
display_alert "-----------------Relaunching in Docker after ${SECONDS}s------------------" "here comes the 🐳" "info"
local -i docker_build_result