From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041981831189626880 X-Received: by 2002:a05:6402:270a:: with SMTP id y10mr16146401edd.108.1639589170880; Wed, 15 Dec 2021 09:26:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:d10:: with SMTP id gn16ls1162567ejc.5.gmail; Wed, 15 Dec 2021 09:26:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFSIVrSnpG/xwS5jmjOV5i8RVtiEoX+QjgfkhuXEmy5obqGoVtjWiFNOc96bp7pxmG8NCc X-Received: by 2002:a17:906:31c2:: with SMTP id f2mr12092708ejf.341.1639589169862; Wed, 15 Dec 2021 09:26:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589169; cv=pass; d=google.com; s=arc-20160816; b=bbr/j7xPePRsZ5TR8rs8FdLJIuHQsmpbXO63mOH1eMtgBTtTSzfxEV/Q0JY4qAv6yl 05JjmbJy4+7uhRFTqoZ5fAAo1cdFXwYcUhBAuhftfsGR74xt+hzZaGoi1lZMjW8SYib6 Hk8x8XeyPHWilvN4hvWQ2sHhk11icaYPyQzi7p5Fbi8YLX8B/TazubsUIIx9tkEF6RV9 0zkKnlCUGVG6pMaRsSDF748T+LNMuwFrR7W7Ozk412DCoMEeN23JkXgBvZpO3lMSuLHa yIljx2iTZBAZ+ElaXUPRV/1EEAuxMqDI0kdKf7cIriOm3AAz/p4+2hkJkcQ2zMjakMBi Pu0Q== 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:date:subject:cc:to:from:dkim-signature; bh=gZ5mPWJr9TG56ceUHl7mcsXpAXSqKCnIif+OP7ajHbs=; b=ufKNVVAzf93e6YAze842YZg2MfHE1PcXN/c4s4zZtD/HpwRb0yTk54rbkge7KXf/4n xyFautJLA4iO0KSenGCjfJwN+GHvJfUDDvXqJr02lfPkAD2wJ2Hk52rfSVs5/RTR4egY yAC/GRT6bTL6Q+K71AZJIbRm1KZKYMZUz4N1YZjLBR/ORaHkLT9RPESskRkguIbomF+q mI4Pkrg1QPnE60ht1ZlNOe5if+0YN3AsWgVsEzCIUs1Md0/THR5UNEfYlXfuf3v6OqIc LDtRrdOtArMF++XjZTwkMi1vobLov6yJY/cFpTql4kcsSfM6/z7Tcf6X3xIJfzaMheHi YNsw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIosbdAw; 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 2a01:111:f400:fe0e::606 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0606.outbound.protection.outlook.com. [2a01:111:f400:fe0e::606]) by gmr-mx.google.com with ESMTPS id bs25si99198ejb.2.2021.12.15.09.26.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:09 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::606 as permitted sender) client-ip=2a01:111:f400:fe0e::606; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIosbdAw; 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 2a01:111:f400:fe0e::606 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=e9JAbfPKRILTyLq2lwp4f84uAO7Gl6rtCVqyHvxlGFHVeCewWOK0CysKn+yCSA/gwFKOCHuX4Vo2p+xxaphwUONYnB0KcmbC01ReX7Oy9gxTyzKdH+h2mDCwFEw9m6fUENaMk3JjTStoNfSxVmqIYzNuT6CDfAAt6jV3loLQtLUqolAovtKW3EFWVw1Lr8wLABgqxE5i8W9OwmG1aivKyq95WvBS6T8WRkZ0Xd1b0QuhpKSqhqZ5AlQ33tcqSWNdQJ4XBHBU1WnW7vv89AUDO2go8T2VOI93k/HgrYy9SJdukgcAuM16Xzt+GHeGTUgX6+lKeoTJQCqGNsZThXnZJg== 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=gZ5mPWJr9TG56ceUHl7mcsXpAXSqKCnIif+OP7ajHbs=; b=i/IZiUewh5JuwODTw3uAf5itZ2CVnMCpoAiTyOqjjYLGWqxyN+I784l8iEF8ViHN5sNvzTn4sEJR/9ERTKN7FZxBCShcq2ixsm4zjxl4zn2q+OrLjgPYDn19vjilIdloTgxcG0+y9Xo1d6p3QitVAtyxHsDpLN+4baBDNuNYVJpKtCUtKWGCr0Jwe1Z4UlossQi6ZxpB1esj24f65++6JnrI23Tk8ShcvjcHGXS2VwuO3ZPAL7epzfUTYM+2GCqzuU8bS8wUXrfkJdS4QEsP2uj58jiAbhmXA7U8VDpT77YZFcyq1SFQF0Dy2zja9IuHFnIJWcTxVi+wAFFG/b7NcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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=gZ5mPWJr9TG56ceUHl7mcsXpAXSqKCnIif+OP7ajHbs=; b=EIosbdAwAAr4Mbl+DHOBTKFlNH0AvS7osjPFxj5+9hOSwcEA3wTzUZ9jQ8+2R4EAbleKoq2/dUNCmpS78L47SnjAKoaeJcS8GducNE50quGmNMJZq4o0QnejpfgfLTmS2uz+QkaDpUbxoJCC4i6OILRHWDSbyNtTffr55nsj4NjT1IrgjKZBdWNlesT3XjT9EUR+N8vUbqJG1Q/auOtwHhMKOfYWEstGf8y6J6KvGAzQ72hv/X/yFdEfUignrlYxmLdzgNpAj1296mGmc/xGhqI38oXwyZlZMd/DryNNu/uRmM/sBKW62sfUeVcKymlcT0sMmhxLKmkZSUePZ1ldow== Received: from AS9PR06CA0165.eurprd06.prod.outlook.com (2603:10a6:20b:45c::12) by AM7PR10MB3159.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Wed, 15 Dec 2021 17:26:08 +0000 Received: from VE1EUR01FT049.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45c:cafe::91) by AS9PR06CA0165.outlook.office365.com (2603:10a6:20b:45c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Wed, 15 Dec 2021 17:26:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) 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.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by VE1EUR01FT049.mail.protection.outlook.com (10.152.3.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:26:08 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:26:07 +0100 Received: from localhost.localdomain (139.22.39.210) 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; Wed, 15 Dec 2021 18:26:07 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 3/5] classes: allow more control over container image name and tag Date: Wed, 15 Dec 2021 18:25:48 +0100 Message-ID: <20211215172550.27153-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d23ed00-9e20-46b9-ee65-08d9bfeffb4e X-MS-TrafficTypeDiagnostic: AM7PR10MB3159:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p59PPVp7kqmEkV34YvbpauHjGCgelw0mQuyrJHhT63yNK4AvixCvH+NB3Cg2qJgjKdt7XmB3tIU4YGkORvIOKX5DxskOB0WSHOm/YDlq7DGmxFHQwXdkfecuMeuirp5nPmNuBpz8yR2hhhDJCQtBc4VHv2KRYV+ZUc1QGmOnQQJm7nrD69N818YCTPm/A2NYncFtmcSFbipaJ/rY3j6L5aeEO1TaYR/+scKoAk0CCjzZJevsx/GTYOEZ3MesUglUvWNbmTSqSyEo1mKBX5rnewMvJHTkchepf39qRD/KaeAMf2i4zlD1nKkC3aLaBviejxuqsHxR418l9zCIehtnqV5zC7xqXYcqksP8MoN+bVO265AzOSHer1DGpT15T1htdoFhZYFbLkuYAxKQErZAECPVCP+taXrLD6PTOljioaLBHYPvYkUgX2C5RvXi77RUi+GAzH6T3GXmgGiYt+RtLASu2dTk/h5zQKzO/EHgq/doW2TjhSaLlnnMbXQhrB78VOSmYa3921s29LIWA0C0aVmRNfjO6UtwMPtE3Nqr2RMmpP9ABLJ7lDb6M+vhQum3N2FOytqDSjCppuhfym4WfaURjNjUt9Qp0/1PCJwbyfI1YK1X3Z64oHLmp2gqmLeNBNXmGUt1Qec8U6Es7OQayMxh+os+WXFD1dObYpZ8XoMwoeCblNL9ICSPd2s+pc8Q+3gIR8K7Nuw/qpZKevhpd+Ryf+8J9hV/T4eg3adDiuzpmMV88Nj3sXCdhIodB3p4+OZvP2lWcM6eanTTn+tChj5ZR5qf8zk79bgqkZ5as+Y= X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(36860700001)(1076003)(508600001)(86362001)(5660300002)(16526019)(186003)(4326008)(83380400001)(82960400001)(44832011)(70206006)(336012)(70586007)(26005)(956004)(36756003)(2616005)(107886003)(47076005)(6666004)(356005)(40460700001)(6916009)(8676002)(81166007)(316002)(8936002)(82310400004)(2906002)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:26:08.3444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d23ed00-9e20-46b9-ee65-08d9bfeffb4e 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.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3159 X-TUID: NGIPeRCgKW+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 | 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 ``` - 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 } -- 2.32.0