Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Francisco Gil 2026-03-27 11:50:54 +01:00
parent cc2630c59e
commit 6f1080025c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-digi-containers/recipes-core/images/dey-image-container-artifact.inc
View File

@ -11,8 +11,13 @@ do_image_container_artifacts() {
default_template_dir="${CONTAINER_DEFAULT_ARTIFACT_TEMPLATE_DIR}" default_template_dir="${CONTAINER_DEFAULT_ARTIFACT_TEMPLATE_DIR}"
generator_script="${THISDIR}/../../scripts/generate-dcp.py" generator_script="${THISDIR}/../../scripts/generate-dcp.py"
image_prefix="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}" image_prefix="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}"
workdir="$(mktemp -d)" mkdir -p "${T}"
trap 'rm -rf "${workdir}"' EXIT 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 if [ -z "${template_dir}" ] && [ -d "${default_template_dir}" ]; then
template_dir="${default_template_dir}" template_dir="${default_template_dir}"

9
meta-digi-containers/recipes-core/images/dey-image-container-lxc.inc
View File

@ -10,8 +10,13 @@ do_image_lxc_bundle() {
rootfs_tar="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.xz" rootfs_tar="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.tar.xz"
fi fi
lxc_tar="${DEPLOY_DIR_IMAGE}/${LXC_OUTPUT_NAME}" lxc_tar="${DEPLOY_DIR_IMAGE}/${LXC_OUTPUT_NAME}"
workdir="$(mktemp -d)" mkdir -p "${T}"
trap 'rm -rf "${workdir}"' EXIT 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 if [ ! -f "${rootfs_tar}" ]; then
bbfatal "Expected rootfs tarball not found: ${rootfs_tar}" bbfatal "Expected rootfs tarball not found: ${rootfs_tar}"