From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:adf:f7c5:: with SMTP id a5mr17740941wrq.99.1627910882822; Mon, 02 Aug 2021 06:28:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4fc1:: with SMTP id o1ls3037278wmq.2.canary-gmail; Mon, 02 Aug 2021 06:28:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWos1HXClG+mKONMqfxoDqfp3Q6jGenc01f0L2/agzPnfn7jaD+gVFJz54MPjaohML85B4 X-Received: by 2002:a7b:c316:: with SMTP id k22mr16622333wmj.56.1627910881953; Mon, 02 Aug 2021 06:28:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627910881; cv=pass; d=google.com; s=arc-20160816; b=NbSWlb+DWAQb+kZFMq9GE1KKzU1wbBx3DO7RD+oqphVQXdifyDox8IRo164v4RWj/n d5y9FOpEf5l2AZxGakJAqcp/uPycKWQTbbeRDkWcHMPUQ42qOaM8o6C0uWtBZoi84eLp 5eoRdfDe+CMmlZjVdZuFX9BtAOxaUowXNde8OkXG5W7fO+5TXmjIORNUrHIaFdzxEpT/ E+2SH7hCU9aTSE42FBlfL1RW81FOlylzmf5BbIX2zxwxjAOIBFpwU715kxiMtraF1rPt qXDtIE2WDOYuoW2h/6Kyj8cltJ+wEi9bMvFCK5hdmLJIxMuCH6Z5JyBl6fw+zCMnHPG8 TNLQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language:in-reply-to :user-agent:date:message-id:from:references:cc:to:subject :dkim-signature; bh=AMrruu27+n7Z4JdQCORREkxiYpp9Se/QpfwxBn4imZE=; b=x1TDemr9Z8lqeK4fTIETc+3SpPowALfZFbpJ9klcO9JAxmFUa2DA0uwclOnXMAmzr7 i2Zu87fXEsImuMtWoRaxYKYPlNCdkQ1KEvAhJjqD8DncMJWnEAadJxihUrxpm3AYinkH tZ0GYq8bAJBhFmYfJereMw2fwM7HD8nGx7xZXo+KxpV8gP24llTahqe+AmcWuyiddHRj YjB+FKvKDJg+Cl09SDbjgqnmS9Q6FDulBPnGd0jtwalAaPT/DD5k9/tEN/L/3cY6BIr4 Rbec1RkR+nkz4nKHy0CMYszAMPt6G8qVX18g1VELdAuVEtBhORff7wFuBNseX9VJebZY kaWw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=Gnmcluvz; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.8.80 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80080.outbound.protection.outlook.com. [40.107.8.80]) by gmr-mx.google.com with ESMTPS id o83si358635wme.2.2021.08.02.06.28.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 06:28:01 -0700 (PDT) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.8.80 as permitted sender) client-ip=40.107.8.80; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=Gnmcluvz; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.8.80 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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=ZgarCMNH4x8JGPqbIk1vcMs6HjHt096MxT4OObvGjsdjgf/AjS4z7IVlGoQeewp0nlxLhqmoQv2vYie+pajtZOrHK7RI+jSP79HIrPMjasqF/TI0s3VXwX8gnLgv6zFhRiR8pb+s2XGNdgO6goJXFgRMo/1DQ357Gga3tzH7ZLe9HgPnyIY0oKLSSAxJ7Pqo0F3E9vn3mqk+F2FPseEpRj9Y958oK3pJyIJzNEGVyhWA14aDMQ82RTnGjJSm2CaoUbjzrW2JZSyplcXLrU4xKDipULi2UuyVqhQqgmy4DnO1pj6/SOd8Sqx6pPwfDGnTat7SWWE4qHT/Zl0KCru8sQ== 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-SenderADCheck; bh=AMrruu27+n7Z4JdQCORREkxiYpp9Se/QpfwxBn4imZE=; b=I+o8Jgsn9OARfVn2mmyjGOjIdRwOTgLN/r16CSe4xDK31tqJ2ZPCiWk+HLJOVct7/yHWggTF8sYBnMng5+OJCr35u7/5+nzG6TvM1C7x/YV6FUGf7thfD+Dqq34lq0mGaoLCVZEoFAdBX4iY8hrvgxcphE12Ju/THDlskAQvtRJWeW8UVCaCA5OopmLCPLM/YwWmTJLTogQZT8RNH1dbJUgbLA1KhjG7O/DOH8V6oAJ2mXGcPOy6Z0mgqmc1k/yYGBVyCH1nvZtdC4cHZfLdjOPjkdHjDdANH6BWF67ZHh3aV6xiob1Ksdl/vY7R7Rd99n77dhDIUAXPt8ErTVE0iQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.onmicrosoft.com; s=selector1-siemens-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AMrruu27+n7Z4JdQCORREkxiYpp9Se/QpfwxBn4imZE=; b=GnmcluvzHgBo+iicWdPohk6aGJ2tE2lLX2jQlfnmHAJb6vch7IjTr5x8tW2kgkLk8eiz3Nk9SLwI1pQCuiwlvZfoYj46/TVU/pU7lzckFBmxuBQlVMg/VW1UGaOr6S/SbezuiMC53mpwlmzQPePZaJejakUWz3iFwY/bxq+SMJ8= Authentication-Results: googlegroups.com; dkim=none (message not signed) header.d=none;googlegroups.com; dmarc=none action=none header.from=siemens.com; Received: from PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:ab::7) by PR3PR10MB4318.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:ad::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Mon, 2 Aug 2021 13:28:00 +0000 Received: from PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d6e:ae99:c95c:83bd]) by PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d6e:ae99:c95c:83bd%9]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 13:28:00 +0000 Subject: Re: [PATCH v3 3/4] classes: allow more control over container image name and tag To: Henning Schild Cc: isar-users@googlegroups.com References: <20210802115404.22707-1-henning.schild@siemens.com> <20210802115404.22707-4-henning.schild@siemens.com> <20210802151447.6e4e7ded@md1za8fc.ad001.siemens.net> From: Silvano Cirujano Cuesta Message-ID: Date: Mon, 2 Aug 2021 15:27:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 In-Reply-To: <20210802151447.6e4e7ded@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM0PR04CA0057.eurprd04.prod.outlook.com (2603:10a6:208:1::34) To PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:ab::7) Return-Path: silvano.cirujano-cuesta@siemens.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2001:a61:3b25:cf02:6bfa:48c3:3d22:d916] (2001:a61:3b25:cf02:6bfa:48c3:3d22:d916) by AM0PR04CA0057.eurprd04.prod.outlook.com (2603:10a6:208:1::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.17 via Frontend Transport; Mon, 2 Aug 2021 13:28:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d48a2653-38b9-4804-2111-08d955b9594f X-MS-TrafficTypeDiagnostic: PR3PR10MB4318: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1079; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2k4m3L5eTtYJ4GcpWMbKc0gD56yJ83iybzDIZ7GFvosJuruoX7ChUq1xk0XVv7HCeQJPiToLuC8cDTnJWjpZTZL0V+sVl7QZaCCFdJ73WIr97qnO22sKHJCYSRSae8OSZwsV+A2LjuNVBR6N9SnLIufEtrdZNVIAk5d9hfnEfnwwsEA+AYE6u1F+8soyKCrdYkivc1lQ7ec6nYo0+3MSiG2iH0OaE9XsaFhfl3cYT42lxZvaKkhjpFRc0B3WHo2/fIJxCe1oLPO5u72jU6jK3MwfGLI2o9q7m3meghc+nbe/K6ItPkYolTT2GHyjEsYt/z6BImEW1rOrUbou3HqG7SzQVricdGHmIiSU/ycvyQ5iu06cUoq4WD/mdszGE2nKELEVMgAZIz3J3/xp+A/MtSETIdWeEa6kPxfyoX6G9lB8Xp/39/AvqyCl+GDODcfPmG54ABjVLyjHSlZOsaqTBsUEJbi6XYk32UhhVva1jgBOCx+Zfui3SDsl5Xea6J047cKzy1gkRHVRItQUKrvRGoakcya0t2Pmw6Opwt6MfAIsEKQunS235YHHsqoDazAM1oLiiWGiNzLXFws3Hkuz5QvWEGsNI0QkB742sHLEyZFS1TjgaiNYV4IclbjC1mbTxcR/FkK4+uiQTMYChrm3grxkKtJdLZisJ9E9azq0gaUDn+T/NM1wDWbzekwWwrmZUt4YVOXVnsa1vCtqU4OVgNkDpSd5hCG20vZCPazh2gk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(396003)(39860400002)(366004)(136003)(346002)(376002)(6862004)(36756003)(6486002)(8936002)(86362001)(66556008)(66476007)(38100700002)(4326008)(8676002)(5660300002)(478600001)(316002)(2906002)(31696002)(2616005)(53546011)(66946007)(31686004)(37006003)(186003)(6636002)(83380400001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YzNKaVBFUDJ3TWxTVmV3bEYzSkduejVEMllzUzRlR3FDL0V2VGx3RG9CYWND?= =?utf-8?B?ZktIdlEzOUZTeTdkUkNCRjdOeFljZDYyZzdsNFVBc3BRZ0kwandGWmZmMnZl?= =?utf-8?B?TzBJMGxRK2l5MDdyUTcxSmNHb3Z2VHU1eldQUnFVVXFiMkpUbzE1ZzNNWVJt?= =?utf-8?B?cm15TStiNjNBc05uOXVkMTJXZGZ0QXJld1FkRHhONnNrSXBrQi9ja0tNdjFv?= =?utf-8?B?WWUvRXkyMXlCQjFsZzgrMzFoZTJGTW5UdWhod3VzRGNVL0tLVGU0TGlkSHM5?= =?utf-8?B?UUsyRm5DQkNpSkpGUitmbVQ0aFJMbmF0dmE5YnE0WjBVTHk1bmtsemNoZlAw?= =?utf-8?B?ZThXMmlQTWIrbE1PeFlIQkEyMXJvNU9zYTFtU0JqSWo4eTJOL1lTWGJ6TGxG?= =?utf-8?B?cncxU2xRNDkyQk1PcHdEMU96Nm1QUUQwKzdPd1BxYzhMMlRxaHBOOThYdkl1?= =?utf-8?B?OHhOSExaT2YzWmdLQld5YzdCWC9NenRoWEJzN3RncUxVMGd5Wms1THc0dTJo?= =?utf-8?B?WU1Za2IwdFgxU2c2WHJsMEs1bER0ZVRQdGtsMjA5Vm5WU3IzZ2JpS1ZHbW9L?= =?utf-8?B?MDFMdEEyRyswd0NySTVUZDVtSWdQQUpxT0lobGZWcHhIeXI0cW1OUFU5UWxO?= =?utf-8?B?ZWkwR1ZFN1NKL2JpZVl5VU96OGN0a1dQWGlFalRnQjNwTXpRSGszZ0hib2dZ?= =?utf-8?B?bW5sMUVBR0x2MFhnMHZDSTMvTnhJZHM4emdUMUdteGtMbm1IZHRveU1ueTVR?= =?utf-8?B?eFJSUEY2L0lGTXNYb2pSK21DQnl1ZzZCMlVreEE5WEdLWlYwWXp5TmNyb3h4?= =?utf-8?B?bC9GLzUvSHI4ZzIzb2JpU3dNUytXTm9ZdlpLOFIwc0pIaGhrTEk5OWNjMUw3?= =?utf-8?B?N2s5VlI2SzdyWVJxZ3I4a1Z6UHFINzlrZkJnRXBUMlJHb2QrMi9mYjJCNXR1?= =?utf-8?B?VkYrM3dHbUpNVm05bXV0dEdVNVBUMHZjaEZ6TDRSVlBNVnpXVDhhVHE0YU5E?= =?utf-8?B?M1RsTjd1Ry9KMmVHQkk1NEpIeG9SVTcwaTVmbmtCQmI2RjIzNERhN21EbWJU?= =?utf-8?B?VjFEUVprK1A5YkVxM2N4cExMa1lNVnErNXNUZy9yN3pCZ3JRemhyMG43Wlc3?= =?utf-8?B?S2pYNW1PYzE4QzgzQ21mQ1NXR21aam1KMUJKNTl3aktYK05wc1NBYmNFdStI?= =?utf-8?B?bWRudjZpclNEM01yRWozRE9YVmVQMWFYMENaRDJjUVQwSkVpTTNxa00yNCtE?= =?utf-8?B?ejJTV1ZWYmNZMTNUWmtpNHhlSDRjRVIvSTlZeXNsTXlGSHpxK2hjaGI3L0xZ?= =?utf-8?B?QWd5MW1PdytTQnloL1dTOHd1OXFmMzZiSFNTa1RxUXE3QnJ4aHBjdTJidTRr?= =?utf-8?B?WGY0aHhTU2dHZHZ6YVR0ck0xMVJvUEdYVUxMcWNyOUYzcEZCajVWR2QrZldQ?= =?utf-8?B?MTFDT0xHT0d0NFgyVDYwbE1xVDZYbEFQQ0ROV2xTR05MYjBybzc1UWtXeDFI?= =?utf-8?B?Yll1c0FvQVRoR1RpZXl2M095UjVlYzVoOGthMHo0ZS9EME9PdUEvbjljbEtR?= =?utf-8?B?NnJTd2liSUtCTUlaN2VLNFhGWlExaGdTYldCTE9CVUFJL1pMRk5HaFgwaHBr?= =?utf-8?B?MVg2QVZyM212amtLUDN0U2VJU241Uy9RbEhHazdxWGcvVkJwcUpaOUtVNGhZ?= =?utf-8?B?anFidEVSRk1ScElycUdyT0M3TEVLOWZ4RVIwdElhazlWN3ExR2x1WE1QVGFP?= =?utf-8?B?UVlyclpXaVVzcTZjanZzWi9BT29GSmp0bXhwcWhpUTliWHhmMVIrMitzbGpL?= =?utf-8?B?Ti9vbSs1WERlUllsZVYrUTdQUVZXekJXUW9wTnFhUy9KK2ZDUkNSR0RZU2hE?= =?utf-8?Q?bYeGCgKDNEd3e?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d48a2653-38b9-4804-2111-08d955b9594f X-MS-Exchange-CrossTenant-AuthSource: PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 13:28:00.7445 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: slu63/7UADSORT+6E7Z814EdFgvyBpSVghJgQEx+MEWExelrqLjcuV9IwWvLDtD1apwj5sdnX6c6w+gddSZHl0vWVjc5dHO7o7eiGTP6BfVKhKAlKbSJBDobNYoX/53v X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR10MB4318 X-TUID: VKqu/5kj68a4 On 02/08/2021 15:14, Henning Schild wrote: > Am Mon, 2 Aug 2021 14:26:02 +0200 > schrieb Silvano Cirujano Cuesta : > >> On 02/08/2021 13:54, Henning Schild wrote: >>> 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}" >> >> In a comment to patch v2 you mentioned your plan to call it >> "CONTAINER_TARGET_IMAGE". Have you changed your mind or is it just an >> error? > > Oh right. Picked the wrong one. > >>> +CONTAINER_TAG ?= "${PV}-${PR}" >> >> Although only container images can have tags and not containers, I >> still find this name misleading for container newbies (and some ISAR >> maintainers will probably be). Your argument that "docker tag" only >> uses "TAG" doesn't convince me ;-) > > Ok ... at least you give some insights on the other comment. But you > started the "CONTAINER_" thingy. Can containers (not images) have the > format docker-archive ? ;) You're fully right. Shame on me :-/ Do as I say, not as I do ;-P > >> In general I'd say that both "CONTAINER_TARGET_NAME" and >> "CONTAINER_TAG" should start with the prefix "CONTAINER_IMAGE_". Both >> the name and the tag are attributes of a container image. >> >> Therefore I'd rather use "CONTAINER_IMAGE_NAME" and >> "CONTAINER_IMAGE_TAG". But since I'm neither a power user nor a power >> contributor, my opinion might not be that important. > > Usage: docker tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG] > > "CONTAINER_IMAGE_" because that is the name of the class ... and > pretty close to how other classes expose their "configurables" except > for the weird extension pattern you took over wrong from that truly > weird SDK. > > Which gives me > > CONTAINER_IMAGE_FORMATS I agree that for consistency you would have to rename this variable. Even if it breaks the interface, I think it's worth since this feature is not being widely used yet. > CONTAINER_IMAGE_TAG > CONTAINER_IMAGE_TARGET_IMAGE Why CONTAINER_IMAGE_TARGET_IMAGE? Why not CONTAINER_IMAGE_NAME? "docker tag" needs the "TARGET_" prefix because it needs to differentiate it from the source image. In fact if you look for the nowadays right manpage "man docker-image-tag" you'll get an even "better" mixture of "SOURCE_IMAGE", "TARGET_IMAGE" AND "NAME". But at least the terminology "NAME" and "TAG" appears here clearly defined. Silvano > > While the last one seems pretty silly ... i will still take it because > is is prefix+suffix following a clear pattern. > > Henning > >> Silvano >> >>> >>> 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 >>> } >>> >>> > -- Silvano Cirujano Cuesta -- Siemens AG, T RDA IOT SES-DE Corporate Competence Center Embedded Linux