From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041981831189626880 X-Received: by 2002:a05:6512:310e:: with SMTP id n14mr43988593lfb.167.1641318817932; Tue, 04 Jan 2022 09:53:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:158e:: with SMTP id bp14ls1320443lfb.2.gmail; Tue, 04 Jan 2022 09:53:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzf5EZeznDEE02jRTjykJNwY5nZh6hN9ouzCq3eEWtz6ta/RdUvdsotxkMKWJhYiea2bL6Y X-Received: by 2002:a05:6512:2828:: with SMTP id cf40mr44807774lfb.644.1641318816878; Tue, 04 Jan 2022 09:53:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1641318816; cv=pass; d=google.com; s=arc-20160816; b=QiZE6fkuaN+mhd7OiR8IvyiGD3RLMa/squnUO98Mm4SS4vsFPFE/qWi2HM5VBa+mF2 3w1dJfo8Qe4J7HTeJbWQU9L8kljgl6iFMRZW0mWryuBJrWF1IctfvdRVYY7Ohw6jYYFl /as0WxzyCSkmiWYPi1zZBoNuQGTW+HmE9JDBAeaDjyd7qg/4FbjzvdzqlQA5Pr2OdQsS FX1i9mUCTQSG74EJj9pq+JttDt3Z8dlY4sGX4kg+ZjBRuyAGXq+0cj4LUpHHi2kTM2ZZ ceflIH1+TXv229VunZ04ouhGHEu3xqV97GxF9m+BWUGXyBxr1K71YHwVnf6f7g1mtdk8 CrRw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=4ks15rVOiwksO/qhn9G7t3wdp7guBPm7ZrNDKoz7Ki4=; b=ASVAE3lNu7PCzP2c+xWwU6l5fIXKdjtVVVqKAUO5Nygb8sexNsRq5EevIe5YFNBWyd Hg7NhHQExJGbn9jM3rQX2KsozyEpYJOKUx4HktBnIsMYPQbarg2c3138x9rWpur7m5y0 4SQKIm6rEsaC2Pd6+BeOhcetAJ1JThdrpTp6VVcfA5tQwanOb9y5jbBsKF5naPJKWxOO 7Sbs/b3dDUsnHC2U0xk4dXqnebV02lJ/etICqtuAnbwt0jVemnR/dIG0058ZIjFIKRfL tG8Bu78Dk1s9b14chHbzxFbm40SpDYaclSsLzluNMAGSW9Vne5MaqZ7ZQNZTJsMue0w8 Tezw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HwlWBJsI; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.74 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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70074.outbound.protection.outlook.com. [40.107.7.74]) by gmr-mx.google.com with ESMTPS id v76si1747734lfa.6.2022.01.04.09.53.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jan 2022 09:53:36 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.74 as permitted sender) client-ip=40.107.7.74; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HwlWBJsI; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.74 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LTl1vjDiO77podm5AzYAvShZwrldNQV1u+SQyFSFoLzIeyd2oHpnr0XZChGwecZUOQWKpyrokyx6b0ilSvbIvlOw1Yz87W6g7BPJiJMu4DQJAefBlUMYF4+deGWBe4TpW8MHbHym29iZq9v0X06zJQAFckYPliPBkPnABYO8pJg6W0gJiNg4UotGledU8+9RnDqhz5nWgTfIewMchaPqWjjZ+dr6gzU0PZEZ4AgWrbi2aWnXFdl3/t/wAxF2aqJrNHDG/ZnsSDXd6iXrM797F3LercB8Wjrz/bwjPh/stnq0wM6aItj5CfnSGbJxjJ58mqN4M2TWvoRwZDB9kQyaZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4ks15rVOiwksO/qhn9G7t3wdp7guBPm7ZrNDKoz7Ki4=; b=Tu8gWVjTloyeiFcea7pKtzfKC0Dz29HmWDy5fu25DPB3llJhzU9tXJfM+bXTZhx8gOcK8umKIhwUz37FmlfhHjufgE7YYxM5iLiFpRrSacNj+eL+WFG8C3ZbLqoQ1Wip903vbrQL0XQExhOep2rE5AAfRWanzTg+PxJ6UsOhDCvL+ROZ+62aFqZTaQR2BkkBRcr+YNQLtvkd8VrC1+qU7NuhxfFlYBjVyw+Savjo9AhjOSSJblgE7MfBN5DhJXdgEKSoaLjsRo1tobHoMG9ZOx+zksrbmJxeS5G3xyRjKHEvi5YOVJf450abk+ubGVXkeM9UHWchlh7n2WU93qa7WQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4ks15rVOiwksO/qhn9G7t3wdp7guBPm7ZrNDKoz7Ki4=; b=HwlWBJsIjxpAV7e3C3f9hLfKxWYsexn/9zB032ZVVIxRVD8o6Bebkv/HSDYYrqgB4JKpMW4fk5G7SJioVxymnok9cxxUynljL0mguv6TNWyI1045jGQp7lBuzckMYBfMzz063UF9yX3mLJ1bVJhA9b374aZREJA7syxZ7MeMQe5bwhuJF7ru9npj50aKhHMhiCfC4fg3Prl0c1YQtyvO6ABOxj4pTHrk99KK2XqiS9f0PMfwqt7+yicc7EsvlczM+khpd6bP4HUn7hILlxuQqw3ndDiD5BBg6ynyDXIJ1t50eTZ2GRKuGGLKr0fLyXEH9NNccqs8dgs0hoheoEWxOw== Received: from DB6PR0301CA0043.eurprd03.prod.outlook.com (2603:10a6:4:54::11) by AM9PR10MB5113.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:438::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Tue, 4 Jan 2022 17:53:36 +0000 Received: from DB5EUR01FT040.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:54:cafe::48) by DB6PR0301CA0043.outlook.office365.com (2603:10a6:4:54::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14 via Frontend Transport; Tue, 4 Jan 2022 17:53:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT040.mail.protection.outlook.com (10.152.5.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4844.14 via Frontend Transport; Tue, 4 Jan 2022 17:53:35 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 4 Jan 2022 18:53:35 +0100 Received: from md1za8fc.ad001.siemens.net (158.92.8.107) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 4 Jan 2022 18:53:34 +0100 Date: Tue, 4 Jan 2022 18:53:33 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta Subject: Re: [PATCH v6 3/5] classes: allow more control over container image name and tag Message-ID: <20220104185333.7bff01bf@md1za8fc.ad001.siemens.net> In-Reply-To: <20211215172550.27153-4-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> <20211215172550.27153-4-henning.schild@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Return-Path: henning.schild@siemens.com X-Originating-IP: [158.92.8.107] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b98d2953-624a-4ed4-e855-08d9cfab2192 X-MS-TrafficTypeDiagnostic: AM9PR10MB5113:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FQS9gLBGxvOpHKj1kmZ9M5Yh7FQueebCBWHvFomyubXbdt01q4LVNaDun54afIsOCUZ+Ht+g7OjJ/sBJ233Ie50UMUPOlQpKLpxJAkI3jhgk6PtbdnzOWo8LpzbxaRz5msBaBiZ7BW9+z5wyf7N1xDoKMcAeWCkL6TFQQvmaA+a9RdpPRzIfLRWQMtF7958jKH+x0wM4aSmWYJM8oaPiSxb6jzANZkAUN+nivLkhfwGt8EESZS2Ha/JNurHQZ2VtPpJibCw7BHLWfmBU18/wkKfJAtbvdza3vpAZenLmF4b3/zO54m5S8WbBGuxDbqrPszkYTkIMSyQlfqyayOSSYKan9v227BKMrgHCq6Nu+zTzZ2kB82Tj+pfEjbWWgzGSUXBi/A7o1rujJjz5o/TAcQPSzH+dvn1tiv2ZzVo9ZIX9hAB3KXyiOeQ+A41jyxIBxw3KUbKqYyD4bx66FZZ6c4i2K6goIKCvzAvNShwGht9BZqukl9vDVa6iNRFMlWIP2Hvl3Xuv+ogP+eTXfgniFFUJ4EUu3kE61ZuvKgHIrJ7Gi/EbwPAll2hEW6jwkEBHIUxgUwqZw5N5M7XPcOigER0wNwAMxCOo4GOKY4MrWCRdgXEMC/VwmeFIQnBOkVwX9qyXbx3q6sBCUVbwQNw24VEz2Qh4lu9Kvl0p3dFFfTSUSSq0ZrZkaGhXwFsVSJzKs35ThWgp+hNQok6n9yrFGEy7R3+d4d2sRqMAbme1FpKu2SAJxbdOoYaOR5RSoMieA6P0ExbPoKXK9DCvkFwwTGROkxw24zJEDSGkc4tBG8w= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700002)(186003)(9686003)(36860700001)(1076003)(6916009)(47076005)(70586007)(40460700001)(8936002)(316002)(508600001)(16526019)(83380400001)(2906002)(26005)(356005)(8676002)(956004)(7696005)(86362001)(70206006)(4326008)(82310400004)(44832011)(55016003)(107886003)(336012)(82960400001)(5660300002)(81166007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 17:53:35.8487 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b98d2953-624a-4ed4-e855-08d9cfab2192 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT040.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB5113 X-TUID: JnM8GNGtoEQ/ Am Wed, 15 Dec 2021 18:25:48 +0100 schrieb Henning Schild : > 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 | 12 +++++++----- > meta/classes/image-sdk-extension.bbclass | 2 +- > 5 files changed, 17 insertions(+), 13 deletions(-) > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > index 55836258ce49..b3e6a2af199d 100644 > --- a/RECIPE-API-CHANGELOG.md > +++ b/RECIPE-API-CHANGELOG.md > @@ -306,3 +306,7 @@ When using the plugins it is advised to name the > partition "/boot" and to exclud > The variable is renamed to get closer to OE/Poky variables naming. > The old naming will still also work, but with deprecation warning > shown. + > +### Change default "NAME:TAG" when building container images > + > +The "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 > c81c6e466e40..eaafd6a9d708 100644 --- a/doc/user_manual.md > +++ b/doc/user_manual.md > @@ -305,14 +305,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 I just tried this for real in the layer i wrote it for. Turns out that the version in the filename might not be the best idea, because none of our images do that. Having the version in the metadata might be good enough while having a stable filename. What do you guys think, should i write another patch to remove the version from the deployed image? I tend to do so and it would be more in line with all our other image types. On the other hand we could think about PV in the filename of all our images, but that would be a pretty dramatic change. In fact the PV of an image is not too meaningful to most people and hardly ever bumped, people rely on metadata ... /etc/os-release. Henning > ``` > - 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 ``` > > --- > @@ -1139,14 +1139,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/sdk-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" sdk-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 8fef52a7195c..4e0fe0efb484 > 100644 --- a/meta/classes/container-img.bbclass > +++ b/meta/classes/container-img.bbclass > @@ -10,10 +10,8 @@ do_container_image[dirs] = "${DEPLOY_DIR_IMAGE}" > 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..b8cf85a5c256 100644 --- > a/meta/classes/image-container-extension.bbclass +++ > b/meta/classes/image-container-extension.bbclass @@ -6,15 +6,17 @@ > # This class extends the image.bbclass for containerizing the root > filesystem. > CONTAINER_FORMATS ?= "docker-archive" > +CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" > +CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" > > containerize_rootfs() { > local cmd="/bin/dash" > local empty_tag="empty" > - local tag="latest" > + local tag="${CONTAINER_IMAGE_TAG}" > local oci_img_dir="${WORKDIR}/oci-image" > local rootfs="$1" > - local rootfs_id="$2" > - local container_formats="$3" > + local container_formats="$2" > + local container_name_prefix="$3" > > # prepare OCI container image skeleton > bbdebug 1 "prepare OCI container image skeleton" > @@ -42,9 +44,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_name_prefix}${CONTAINER_IMAGE_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..052c1b580451 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}" "sdk-" fi > } >