dey-image-container: clean temporary task directories reliably
Create task temporary directories under `${T}` instead of the host `/tmp`
and remove them when the task exits.
This avoids leaving large temporary directories behind during container
artifact generation.
Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
This commit is contained in:
parent
cc2630c59e
commit
6f1080025c
|
|
@ -11,8 +11,13 @@ do_image_container_artifacts() {
|
|||
default_template_dir="${CONTAINER_DEFAULT_ARTIFACT_TEMPLATE_DIR}"
|
||||
generator_script="${THISDIR}/../../scripts/generate-dcp.py"
|
||||
image_prefix="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}"
|
||||
workdir="$(mktemp -d)"
|
||||
trap 'rm -rf "${workdir}"' EXIT
|
||||
mkdir -p "${T}"
|
||||
export TMPDIR="${T}"
|
||||
workdir="$(mktemp -d "${T}/dey-image-container-artifact.XXXXXX")"
|
||||
cleanup_workdir() {
|
||||
rm -rf "${workdir}"
|
||||
}
|
||||
trap cleanup_workdir EXIT HUP INT TERM
|
||||
|
||||
if [ -z "${template_dir}" ] && [ -d "${default_template_dir}" ]; then
|
||||
template_dir="${default_template_dir}"
|
||||
|
|
|
|||
|
|
@ -10,8 +10,13 @@ do_image_lxc_bundle() {
|
|||
rootfs_tar="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.xz"
|
||||
fi
|
||||
lxc_tar="${DEPLOY_DIR_IMAGE}/${LXC_OUTPUT_NAME}"
|
||||
workdir="$(mktemp -d)"
|
||||
trap 'rm -rf "${workdir}"' EXIT
|
||||
mkdir -p "${T}"
|
||||
export TMPDIR="${T}"
|
||||
workdir="$(mktemp -d "${T}/dey-image-container-lxc.XXXXXX")"
|
||||
cleanup_workdir() {
|
||||
rm -rf "${workdir}"
|
||||
}
|
||||
trap cleanup_workdir EXIT HUP INT TERM
|
||||
|
||||
if [ ! -f "${rootfs_tar}" ]; then
|
||||
bbfatal "Expected rootfs tarball not found: ${rootfs_tar}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue