[RFC v2 16/19] container images: make compatible with rootless build

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes-recipe/imagetypes_container.bbclass | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/meta/classes-recipe/imagetypes_container.bbclass b/meta/classes-recipe/imagetypes_container.bbclass
index b6cc4a14..615aa428 100644
--- a/meta/classes-recipe/imagetypes_container.bbclass
+++ b/meta/classes-recipe/imagetypes_container.bbclass
@@ -67,8 +67,11 @@ do_containerize() {
     run_privileged umoci remove --image "${oci_img_dir}:${empty_tag}"
     run_privileged rm -rf "${oci_img_dir}_unpacked"
 
-    # no root needed anymore
-    run_privileged chown --recursive $(id -u):$(id -g) "${oci_img_dir}"
+    run_privileged tar -c --owner=0 --group=0 --numeric-owner -C ${oci_img_dir} . > \
+        ${WORKDIR}/container-image.tar
+
+    # on success clean
+    run_privileged rm -rf "$oci_img_dir"
 }
 
 convert_container() {
@@ -78,6 +81,9 @@ convert_container() {
     local image_name="$2"
     local image_archive="$3"
 
+    mkdir -p $oci_img_dir
+    tar -xf ${WORKDIR}/container-image.tar -C $oci_img_dir
+
     # convert the OCI container image to the desired format
     bbdebug 1 "Creating container image type: ${container_type}"
     case "${container_type}" in
@@ -106,4 +112,7 @@ convert_container() {
             die "Unsupported format for convert_container: ${container_type}"
             ;;
     esac
+
+    # on success clean
+    rm -rf $oci_img_dir
 }
-- 
2.51.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260220171601.3845113-17-felix.moessbauer%40siemens.com.