From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041981831189626880 X-Received: by 2002:a05:600c:3553:: with SMTP id i19mr939031wmq.97.1639589164618; Wed, 15 Dec 2021 09:26:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c90f:: with SMTP id f15ls1235798wmb.1.gmail; Wed, 15 Dec 2021 09:26:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwc4AHwE8SGK57WfXDCVwQg5/8Vehwg0efNFn/BU2CdrqMaaWumzwYnwgpmNC17EOf8LAO X-Received: by 2002:a1c:a783:: with SMTP id q125mr951801wme.132.1639589163561; Wed, 15 Dec 2021 09:26:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589163; cv=pass; d=google.com; s=arc-20160816; b=hu2ERdCSxojNRRWq09eXW5kFg5wpuQiMv4JGQxpFvlt+pZw066SAhF8KSZEz9DfuMj ndDXJGbSols2hrB9o9CWbZrU0wJ8H1iaW9IRpg6Y6tS8jiP8f/JOn06Gfv9M7tqQlF2v obUwBl3AAHnOniIO8UWbERqodMgn9wkruVGu7ARcHdQYmmQsCWUzyNPvqxkpAJqWVcPc JCJCtEW9PxA2UNwQFyk1WFFkhrRTlWnUnGIlTZBlNdVcnZ/dnaN85BfM/8X3KVXHEh3J YP/WMeecG+h0z0NxETexYO4QaOxw2j8Sr7wKVg1eC8VdL2tft9BQ/DZSCtgAluRf1ZZA V73g== 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=e0FvhrGm7Lhw/IqyonUBbytKMNhtGoqHSJ+l9U1N0EY=; b=hb/F0GDko85FIWkCKf9Rd5a68IVem7ykOMSswuNpxObJ7PegUJoFtgOu1aIUVAlvYL EUG6AC2mgh7196hbyXCfgVmLEo40wMQFI4wcTp0HKy1kwK/pdaNFZLuBCYPRb4acXcnI 5LQAS3iqNeZObU3NheE5YzClXDRsUO46s0DERLDV0hmY07rFFB+RjAs6Ugl17b74s80+ 09ItEcwaDlGjqc1r695VlcrJomZx5ATfA/pMpYS+ODHhTkvX/Wi/1wY+tljHwYMzbkwX y0Xja0aJDb0ek0VG1jr03rX+DSD8mKpFznWUbZ53QKwOJx9dPGfgCZ+6Na6mhj/6vVCp J0Vw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNoaZCbf; 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.14.50 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 EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140050.outbound.protection.outlook.com. [40.107.14.50]) by gmr-mx.google.com with ESMTPS id i12si190465wml.2.2021.12.15.09.26.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.50 as permitted sender) client-ip=40.107.14.50; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNoaZCbf; 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.14.50 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=N1ngCPeSpyJJEI2dobvEEafmFL1S6Q6e///zRxtND0IUrHgDemGMOyMV3L2Zmel0VjlaE/CMGQAPK1BqJZ6Wbe267nCn4JDYKcgkY0yz6B93rnXsKZ2/YOE3o+yRKJadsUh/XMPFSZjLbGaViuoYjPT6Fe6UbEiIpbGWmezsBoUSZDVPK6K7jcnDLWqVfe5XPq/ORnOnOBpZq+cIM0/MEfn8xThTIQtfcFIUwwzuJLwS7l0/NtIqGxvLDNXa0rg4l37uALna4FKW/eJhRybYXluHNTe0BpGfjXONGOpiQZzLRtE3RdNQIeGqk3kfszRcZDjn61XeUaklhfh1nRWuPQ== 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=e0FvhrGm7Lhw/IqyonUBbytKMNhtGoqHSJ+l9U1N0EY=; b=JFpafGejALDkd9T0e9ltN7cBIiW4U8pXOui3MGmwLG7sL+4Zg1MmvmR9/zAxBlMVf9/KCATSHlD01B7hA4gkfu/A0MribwPTF79nEz80JynGwtet24MOrD8JRqXToGnxyHwW4iGblsBQJ9SBmOy3FpVNy50WgyxotUVE/tr6O5665dygprtZiKZX+0cC7CMHNw7+JXgE39Pl5eJt4MCVoOOIJvlhn+MoxBn+3g8HI54IWC8iHLnws45N3Vn83KgoiWRwO9YpTYWDk8dMcc406kr8Nqf3mx1/GbObwyq6k4rUeHSVao18ah14UXU7z1I9f7foe1cckeUdvDF5oMIGPA== 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=e0FvhrGm7Lhw/IqyonUBbytKMNhtGoqHSJ+l9U1N0EY=; b=YNoaZCbfYMlQ7vAqwYqf3FcLWQwbXVJu6p4odDGqVpgrSTPxGLPwUwfHLvlgjl7S2YM7CLJn+XfNLxMqIUBFPIHkvl4x2Mjg9Io2SLWsMKifEIHea831E5kUmc+aZ0hzFBlPCd2WbEYfKqVlFLVs3DT93jzYvm8L1cgT4nk1HpMJWoSEoeWhhsoosKUL6DnXVMiwbQBvZuii+4IIOUqnQEHF29AK26BtY0gMi40b7Mldf1mc0F6H0rLrRQuN+yU3Byi0ODWiRQi9UU5QzVH7JkLDFRiOUfPHPgz415Z7ionDZiDQglx48f7YlrsD6uir7OZs1cuU+vhiNlkLD/H57w== Received: from SV0P279CA0058.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::9) by AM7PR10MB3573.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:139::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Wed, 15 Dec 2021 17:26:02 +0000 Received: from HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::28) by SV0P279CA0058.outlook.office365.com (2603:10a6:f10:14::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14 via Frontend Transport; Wed, 15 Dec 2021 17:26:01 +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 HE1EUR01FT061.mail.protection.outlook.com (10.152.1.6) 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:25:59 +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; Wed, 15 Dec 2021 18:25:58 +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:25:58 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 2/5] classes: simplify tag handling in container class Date: Wed, 15 Dec 2021 18:25:47 +0100 Message-ID: <20211215172550.27153-3-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: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03ca5e62-6f27-45ef-3b47-08d9bfeff60b X-MS-TrafficTypeDiagnostic: AM7PR10MB3573:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HfIW5F+GkjtmC4sfn8C/fW0ii4ufTv3tRQOV+BFpXrn1ZEMy/2sJgcMX8LbELB7No19Z10nNi5dx/+8x55ljE5aOds338eRGRV7GWuSkCozI8wbZgHp19aDApcN3Vzf+efJQfgT9RpbXHDTUDB2v3d4TNMIN+Yo1RsLK3lN8n/iZYHKeHQqA8wJ0VU1b/T/cn33bOhCFHrMP5Rpit9XOcyqegKh1/VlQcn0yDRzX41/pAQWcmiG32jnhGdRYzP02NvR0+L/bjT30fFLhYyCie8s9s/eED/B6CGmcUDioYrg4kNImTGiG4sulUm5b3aIm/sDBnfh2FDyJit/mb4nA/aW9KNgqQzMZtEcZRQTi/8ldB7BywzyGt1AKhVL1d81Nub7PpBgiXriUAqxZ5Pa8RWD5b224fXqk2yW5HNBghyX2nalcMmPNR5wiSdhvcPgwZJI8y4JdnX9BUFI068n0K4xnuqhYUjipPCYaW78m6E28NmSxUjqrCj/tUjcsmILB+609I6ihH/85yvffpwKelYlKSSsM0IFUhG1vJNY/3sCXezL1GyY2K5FZT55ZSvm+0YCHQZJpCzYIBXkoQuv7l41N0J8bAwSKdfa3YQ98SEWM4lqhZNNiFsLK/DC6tMZJd/iJkn1WEFrCmzxJPQIWCBroTh+dl3v6upkt+rNmCh9xQKwMkthPwCzDyxk2wqahFgqANvEkbQCiusnrqLl+eajh+CnPW8JowSHdm/S0bxOp9GTs1t7i3cirKbcITz3kuXe2mJhOZH0c3tM9ucRR9ah9Fj2VBQo/CcSoux7ssC4= 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)(40470700001)(70586007)(82310400004)(356005)(86362001)(47076005)(1076003)(44832011)(26005)(82960400001)(107886003)(70206006)(2616005)(83380400001)(81166007)(956004)(54906003)(40460700001)(316002)(8676002)(4326008)(8936002)(186003)(16526019)(336012)(36756003)(36860700001)(508600001)(2906002)(5660300002)(6916009)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:25:59.4874 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03ca5e62-6f27-45ef-3b47-08d9bfeff60b 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: HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3573 X-TUID: xpEcF0Dl5UNB Call the variable "tag" and use it in all places where "latest" was hardcoded. This prepares for another patch that will allow chosing something else than "latest" for a tag. Signed-off-by: Henning Schild --- meta/classes/image-container-extension.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index 6537fc693265..0e70ba9c1405 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -10,7 +10,7 @@ CONTAINER_FORMATS ?= "docker-archive" containerize_rootfs() { local cmd="/bin/dash" local empty_tag="empty" - local full_tag="latest" + local tag="latest" local oci_img_dir="${WORKDIR}/oci-image" local rootfs="$1" local rootfs_id="$2" @@ -33,7 +33,7 @@ containerize_rootfs() { # pack container image bbdebug 1 "pack container image" - sudo umoci repack --image "${oci_img_dir}:${full_tag}" \ + sudo umoci repack --image "${oci_img_dir}:${tag}" \ "${oci_img_dir}_unpacked" sudo umoci remove --image "${oci_img_dir}:${empty_tag}" sudo rm -rf "${oci_img_dir}_unpacked" @@ -49,14 +49,14 @@ containerize_rootfs() { case "${image_type}" in "docker-archive" | "oci-archive") if [ "${image_type}" = "oci-archive" ] ; then - target="${image_type}:${image_archive}:latest" + target="${image_type}:${image_archive}:${tag}" else - target="${image_type}:${image_archive}:${image_name}:latest" + target="${image_type}:${image_archive}:${image_name}:${tag}" 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}" + "oci:${oci_img_dir}:${tag}" "${target}" bbdebug 2 "Compressing image" xz -T0 "${image_archive}" ;; @@ -69,8 +69,8 @@ containerize_rootfs() { die "Adding the container image to a container runtime (${image_type}) not supported if running from a container (e.g. 'kas-container')" fi skopeo --insecure-policy copy \ - "oci:${oci_img_dir}:${full_tag}" \ - "${image_type}:${image_name}:latest" + "oci:${oci_img_dir}:${tag}" \ + "${image_type}:${image_name}:${tag}" ;; *) die "Unsupported format for containerize_rootfs: ${image_type}" -- 2.32.0