From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a2e:89ca:: with SMTP id c10mr10866550ljk.508.1627905247882; Mon, 02 Aug 2021 04:54:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a417:: with SMTP id p23ls1318697ljn.2.gmail; Mon, 02 Aug 2021 04:54:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKQ1pzghWsWMs66VWE15aaf5ifwSS++l2NoSWZvZGvixRDAG4CCyU2gdDY6mlZau5SX++d X-Received: by 2002:a05:651c:28e:: with SMTP id b14mr11226239ljo.193.1627905246684; Mon, 02 Aug 2021 04:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627905246; cv=none; d=google.com; s=arc-20160816; b=TMMlBYmCbdorpMTSv881Va5nTfs4k/mr6TMr8P5/ST1S5HJtoHM1wL+5dFivO8YQfD c7AqbqHX6C+6FfHAz0rdexhEyhTdjMK7gU02RFMazoUdImeNKTuhTOoeD87kaO6L/hiC g2kYIcMZMI4gJSrFnsjanwA2Qo2UhuHGJdJBwSZVvUV2DEg6uc6p4yL91pwlm/lXdVu7 68XK51AMcdNQCvY9Bx7sn1kQbWWi+vZEwlH1Qm0yr3nt4YtKWtLZFNZHaXIpshwULqcF 5q4931eZTc7nW58X0+fh5JeUZnYlB5rE5sSNvEKOtA2QnZ2wBmzqnCn+jxQFEmJp8LvQ aACQ== 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:cc:to:from; bh=j0FwbKnzJTsORHJ8k0+sK7NMCnFMoscMDR3zrXcSkaw=; b=mhX02C9Xf7eJjxirvmJU20tPrRrtPhp5g9yd4HAL9mjPv8Ya+YFWFeCf8UF2EcTnWL BLtJB6LvDI5Io8fDsPnvAN+ERUfOgUxj/MOzYRex5nWi5id0JwOyunDvMDV/RzqNqlSG AxhYC5+o+qYbB3IMmsBgAUp4zHobecvmRsr/ep4NnlLH699cQhbuxcEeZBzvLlhiySzQ PSw27F6qA/hd5FWjYPG4yUYULkFj0MjEtmfvNnqxbYazIDrZH9AZt+vblg19JpcWEDzX 8JFp3nFS59cCbRDHGS5W/zbMxcsbibUw7ojoGNuvo63NIKKepUn/yFYo6yWeKdbH0t4q wdew== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id v15si494443lfa.6.2021.08.02.04.54.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 04:54:06 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 172Bs6C5011698 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 2 Aug 2021 13:54:06 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 172Bs5fK028005; Mon, 2 Aug 2021 13:54:05 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v3 3/4] classes: allow more control over container image name and tag Date: Mon, 2 Aug 2021 13:54:03 +0200 Message-Id: <20210802115404.22707-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802115404.22707-1-henning.schild@siemens.com> References: <20210802115404.22707-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: TlfKWUpD1o+8 This patch allows more fine-grained control over how the resulting container will be tagged. Where the default name will be PN together with DISTRO and ARCH, and tag will be derived from PV and PR Signed-off-by: Henning Schild --- RECIPE-API-CHANGELOG.md | 4 ++++ doc/user_manual.md | 8 ++++---- meta/classes/container-img.bbclass | 4 +--- meta/classes/image-container-extension.bbclass | 11 ++++++----- meta/classes/image-sdk-extension.bbclass | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 806c2914f13f..d12d30e192a8 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -292,3 +292,7 @@ Migrate your patches so they can be applied with "git am", or Kernel image name for arm64 platforms is vmlinux now. Image format was not changed (uncompressed executable) but now it is named correctly. + +### Change default "TARGET_NAME:TAG" when building container images + +The "TARGET_NAME" used to be rather static and the TAG was always "latest", now the values are derived from recipe variables PN, PV, PR. diff --git a/doc/user_manual.md b/doc/user_manual.md index cf7dc2fee35e..e5c07bd41fc5 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -300,14 +300,14 @@ bitbake mc:qemuarm-buster:isar-image-base - Load the container image into the Docker Daemon ``` -docker load -i build/tmp/deploy/images/qemuarm/debian-buster-armhf-docker-archive.tar.xz +docker load -i build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz ``` - Run a container using the container image (following commands starting with `#~:` are to be run in the container) ``` -docker run --rm -ti --volume "$(pwd):/build" isar-buster-armhf:latest +docker run --rm -ti --volume "$(pwd):/build" isar-image-base-debian-buster-armhf:1.0-r0 ``` --- @@ -1070,14 +1070,14 @@ bitbake -c do_populate_sdk mc:qemuarm-buster:isar-image-base - Load the SDK container image into the Docker Daemon ``` -docker load -i build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf-docker-archive.tar.xz +docker load -i build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz ``` - Run a container using the SDK container image (following commands starting with `#~:` are to be run in the container) ``` -docker run --rm -ti --volume "$(pwd):/build" isar-sdk-buster-armhf:latest +docker run --rm -ti --volume "$(pwd):/build" isar-image-base-debian-buster-armhf:1.0-r0 ``` - Check that cross toolchains are installed diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 79ef3e8d756b..9928a58ef53d 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -9,10 +9,8 @@ do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_container_image[vardeps] += "CONTAINER_FORMATS" do_container_image(){ - rootfs_id="${DISTRO}-${DISTRO_ARCH}" - bbdebug 1 "Generate container image in these formats: ${CONTAINER_FORMATS}" - containerize_rootfs "${IMAGE_ROOTFS}" "${rootfs_id}" "${CONTAINER_FORMATS}" + containerize_rootfs "${IMAGE_ROOTFS}" "${CONTAINER_FORMATS}" } addtask container_image before do_image after do_image_tools diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index 0e70ba9c1405..4f93d30219f9 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -6,15 +6,16 @@ # This class extends the image.bbclass for containerizing the root filesystem. CONTAINER_FORMATS ?= "docker-archive" +CONTAINER_TARGET_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" +CONTAINER_TAG ?= "${PV}-${PR}" containerize_rootfs() { local cmd="/bin/dash" local empty_tag="empty" - local tag="latest" + local tag="${CONTAINER_TAG}" local oci_img_dir="${WORKDIR}/oci-image" local rootfs="$1" - local rootfs_id="$2" - local container_formats="$3" + local container_formats="$2" # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" @@ -42,9 +43,9 @@ containerize_rootfs() { sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" # convert the OCI container image to the desired format - image_name="isar-${rootfs_id}" + image_name="${CONTAINER_TARGET_NAME}" for image_type in ${CONTAINER_FORMATS} ; do - image_archive="${DEPLOY_DIR_IMAGE}/${rootfs_id}-${image_type}.tar" + image_archive="${DEPLOY_DIR_IMAGE}/${image_name}-${tag}-${image_type}.tar" bbdebug 1 "Creating container image type: ${image_type}" case "${image_type}" in "docker-archive" | "oci-archive") diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 426b92595554..fa15b588068c 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -80,7 +80,7 @@ do_populate_sdk() { # generate the SDK in all the desired container formats if [ -n "${sdk_container_formats}" ] ; then bbnote "Generating SDK container in ${sdk_container_formats} format" - containerize_rootfs "${SDKCHROOT_DIR}" "sdk-${DISTRO}-${DISTRO_ARCH}" "${sdk_container_formats}" + containerize_rootfs "${SDKCHROOT_DIR}" "${sdk_container_formats}" fi } -- 2.31.1