From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6927266035414335488 X-Received: by 2002:a17:906:17d3:: with SMTP id u19mr23411376eje.316.1612879810801; Tue, 09 Feb 2021 06:10:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:a41e:: with SMTP id u30ls2581226edb.1.gmail; Tue, 09 Feb 2021 06:10:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1GWUJmCTKFE/0+rUONWmtIImMy4KmFmceuM5UO5ku0c5psXnAScHBpye8zMK7MrRQjyAi X-Received: by 2002:a05:6402:4316:: with SMTP id m22mr22851885edc.64.1612879809855; Tue, 09 Feb 2021 06:10:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612879809; cv=none; d=google.com; s=arc-20160816; b=ill2zFXqDrWtQu4yyeqH3f3gX6yQhgaeclosPunEsv9SeHoVPuMpMWbdTyfYz4+Sm6 n1aPLrVuYFixEvyXOVE7GvWYcKgF3/QhGT3lbqSZF3jdv50RtU130gAAC6i9pGk85tkB ogdlEi5jYpzI94lThCIcueQaAhT3cgme2x68ZOEIa3JGOKscGKiCycQGcJMAJO4XiMkq qx30mcX0Hcvh262hNPpkZ/I+WkoRMonjOmowun7dkQZbR1de4cTi3GuaTmcbCLhlD9xg aFvC6I+ab4GvQcuKFzCvHQz2xLSyvlFVrAH7Ed8E/pxoIIwAe5NBcLQaHgv0I7gUygPW K3rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=q+OdxZpIue/CjRQP0RP3z6URr22OfuSHyuv8OJWMvxM=; b=jrTASs805BtNmSOEJD4W8uxQYskniiNSVhC3hwM2zc+DPA42wI+3xBdJ0k6OTY5O9x IWpyxO3jkBwMBgNsfqXeUrDu9Yzn2pIkQ+8rMB2SJAKLAFTu0k4pXOYuhG1dKBU8makp nUDhBQgNT63nUYK4+77Z6Y9HmM84ZiK9GTOcryyNAF13tBNs2z+QTJsxMhxbe7ilUGwX ymK8S1c2saBZL3nqoDu4UiGXr5X2z1u2FeH8ml4Bul/9WjLaUDYSAAhKxqragmX6nNLB d011Rr/slWPvjxwpoimxatytvCUgXEJFmaV28HZ8NCUc8Wy1BWoPzR1jWZb1pWac/1tb KpTQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id y20si876046edv.3.2021.02.09.06.10.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2021 06:10:09 -0800 (PST) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 119EA9PN025516 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 9 Feb 2021 15:10:09 +0100 Received: from md1sf36c.ad001.siemens.net ([167.87.10.176]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 119EA6ti018204 for ; Tue, 9 Feb 2021 15:10:08 +0100 From: Silvano Cirujano Cuesta To: isar-users@googlegroups.com Subject: [PATCH V2 1/2] images: add support for container images Date: Tue, 9 Feb 2021 15:10:04 +0100 Message-Id: <20210209141005.45491-2-silvano.cirujano-cuesta@siemens.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210209141005.45491-1-silvano.cirujano-cuesta@siemens.com> References: <20210209141005.45491-1-silvano.cirujano-cuesta@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: LY86DvxAOQ9P Add support for creation of container images with the build root filesystems. Extend also task "populate_sdk" to support the creation of a container image containing the SDK. Signed-off-by: Silvano Cirujano Cuesta --- meta/classes/container-img.bbclass | 99 ++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 meta/classes/container-img.bbclass diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass new file mode 100644 index 0000000..85d9fb4 --- /dev/null +++ b/meta/classes/container-img.bbclass @@ -0,0 +1,99 @@ +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2021 +# +# SPDX-License-Identifier: MIT +# +# This class provides the tasks 'containerize_rootfs' and 'containerize_sdk' +# to create container images containing the target rootfs and the SDK +# respectively. + +CONTAINER_FORMAT ?= "docker-archive" + +containerize_rootfs() { + local cmd="/bin/dash" + local empty_tag="empty" + local full_tag="latest" + local oci_img_dir="${WORKDIR}/oci-image" + local rootfs="$1" + local rootfs_id="$2" + + # prepare OCI container image skeleton + bbdebug 1 "prepare OCI container image skeleton" + rm -rf "${oci_img_dir}" + sudo umoci init --layout "${oci_img_dir}" + sudo umoci new --image "${oci_img_dir}:${empty_tag}" + sudo umoci config --image "${oci_img_dir}:${empty_tag}" \ + --config.cmd="${cmd}" + sudo umoci unpack --image "${oci_img_dir}:${empty_tag}" \ + "${oci_img_dir}_unpacked" + + # add root filesystem as the flesh of the skeleton + sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" + + # pack container image + bbdebug 1 "pack container image" + sudo umoci repack --image "${oci_img_dir}:${full_tag}" \ + "${oci_img_dir}_unpacked" + sudo umoci remove --image "${oci_img_dir}:${empty_tag}" + sudo rm -rf "${oci_img_dir}_unpacked" + + # no root needed anymore + sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" + + # convert the OCI container image to the desired format + image_name="isar-${rootfs_id}" + for image_type in ${CONTAINER_FORMAT} ; do + image_archive="${DEPLOY_DIR_IMAGE}/${rootfs_id}-${image_type}.tar" + bbdebug 1 "Creating container image type: ${image_type}" + case "${image_type}" in + "docker-archive" | "oci-archive") + if [ "${image_type}" = "oci-archive" ] ; then + target="${image_type}:${image_archive}:latest" + else + target="${image_type}:${image_archive}:${image_name}:latest" + fi + rm -f "${image_archive}" "${image_archive}.xz" + bbdebug 2 "Converting OCI image to ${image_type}" + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${full_tag}" "${target}" + bbdebug 2 "Compressing image" + xz -T0 "${image_archive}" + ;; + "oci") + tar --create --xz --directory "${oci_img_dir}" \ + --file "${image_archive}.xz" . + ;; + "docker-daemon" | "containers-storage") + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${full_tag}" \ + "${image_type}:${image_name}:latest" + ;; + *) + die "Unsupported format for containerize_rootfs: ${image_type}" + ;; + esac + done +} + +do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" +do_container_image[vardeps] += "CONTAINER_FORMAT" +do_container_image(){ + rootfs_id="${DISTRO}-${DISTRO_ARCH}" + + bbnote "Generate container image in these formats: ${CONTAINER_FORMAT}" + containerize_rootfs "${IMAGE_ROOTFS}" "${rootfs_id}" +} + +addtask container_image before do_image after do_image_tools + +do_container_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" +do_container_sdk[vardeps] += "CONTAINER_FORMAT" +do_container_sdk(){ + rootfs_id="sdk-${DISTRO}-${DISTRO_ARCH}" + + bbnote "Generate containerized SDK in these formats: ${CONTAINER_FORMAT}" + containerize_rootfs "${SDKCHROOT_DIR}" "${rootfs_id}" +} + +addtask container_sdk after do_populate_sdk + -- 2.30.0