Skip to content

Commit b8f7fe8

Browse files
committed
SQ separate workdir from device_dir
Otherwise the docker context messes the build up Signed-off-by: Alex Gonzalez <alexg@balena.io>
1 parent 6289e18 commit b8f7fe8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

automation/include/balena-deploy.inc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ balena_deploy_block() {
336336
local _image_path="${4:-""}"
337337
local _deploy="${5:-no}"
338338
local _final="${6:-no}"
339-
local _work_dir="${7:-"${device_dir}"}"
339+
local _work_dir="${7:-"${device_dir}/workdir"}"
340340
local _balenaos_account="${8:-"balena_os"}"
341341
local _balenaCloudEmail="${9:-"${balenaCloudEmail}"}"
342342
local _balenaCloudPassword="${10:-"${balenaCloudPassword}"}"
@@ -358,6 +358,7 @@ balena_deploy_block() {
358358
_esr=${_esr:-"${ESR}"}
359359

360360
if [ ! -f "${_work_dir}/balena.yml" ]; then
361+
[ ! -d "${_work_dir}" ] && mkdir "${_work_dir}"
361362
if [ -f "${device_dir}/balena.yml" ]; then
362363
cp "${device_dir}/balena.yml" "${_work_dir}"
363364
else
@@ -627,7 +628,7 @@ balena_deploy_hostos() {
627628
>&2 echo "No compose file in ${_path}"
628629
return 1
629630
fi
630-
cp "${_path}/docker-compose.yml" "${device_dir}"
631-
cat "${_path}/docker-compose.yml" >&2
631+
[ ! -d "${device_dir}/workdir/" ] && mkdir "${device_dir}/workdir/"
632+
cp "${_path}/docker-compose.yml" "${device_dir}/workdir/"
632633
balena_deploy_block "${_appName}" "${_device_type}" "${_bootable}"
633634
}

0 commit comments

Comments
 (0)