From 6dd7067c79bb04aa2b17eddcfc3730639c070267 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 7 Jun 2023 12:49:28 +0200 Subject: [PATCH] docker: use `${SRC}` as `DOCKER_ARMBIAN_TARGET_PATH` instead of hardcoded `/armbian` - this way host-side and Docker-side `SRC` are now the same path - messages containing the path to a file will now match across Docker and actual host --- lib/functions/host/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh index f8bfab316b..2f48f8b352 100644 --- a/lib/functions/host/docker.sh +++ b/lib/functions/host/docker.sh @@ -124,7 +124,7 @@ function docker_cli_prepare() { # declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:focal"}" # declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:kinetic"}" declare -g DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE:-"ubuntu:jammy"}" - declare -g DOCKER_ARMBIAN_TARGET_PATH="${DOCKER_ARMBIAN_TARGET_PATH:-"/armbian"}" + declare -g DOCKER_ARMBIAN_TARGET_PATH="${DOCKER_ARMBIAN_TARGET_PATH:-"${SRC}"}" # this used to be '/armbian', but now matches the host path. declare wanted_os_tag="${DOCKER_ARMBIAN_BASE_IMAGE%%:*}" declare wanted_release_tag="${DOCKER_ARMBIAN_BASE_IMAGE##*:}"