From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a1c:9ace:: with SMTP id c197mr15683436wme.170.1627893647792; Mon, 02 Aug 2021 01:40:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:db90:: with SMTP id u16ls563450wri.2.gmail; Mon, 02 Aug 2021 01:40:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4DzZloICv0xybJTC5DmmlUSnIyoaP1ECYspl3Cwgis65NNVvgzVDh2VottA0JL+uUYlk6 X-Received: by 2002:a5d:58ec:: with SMTP id f12mr12856069wrd.247.1627893646851; Mon, 02 Aug 2021 01:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627893646; cv=none; d=google.com; s=arc-20160816; b=HCBP6P3//LqAcMI++/DPDsfsdOKxwWOy+B2vCOLHpXgU48a7kZQJoCL1wl2dH5PV8K g6QvGheraPT3EOEF6mx5R4L8+shMBTjoRlHehDWCohtvCorcpWvJIhO2tADfxq9PwQI6 BwuWioMo1Wl0WQXKuWk2qmDl1OiFLYM6swP17+HNRo1k1d58vsJYjk4Q6GGMdueM8cIG 4MZXX/7Zv9i6mk6mTWkX2/bDopMffZuildHXto2X3iuErj28Fb2zo56juFZDyWVyzHW7 x0CSUnelXTwG13+b4hqlRNS03BxSRYnJDaijaATFw+SIFkoyyzJ5knGandzo0/Fvq/sK vIxQ== 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=TPTUhZN/fsHUH0f6RLjF+rxpmRgPUQsN9xCaial/l2k=; b=Ohwi2h7FNo/WSb2u+u5jfQ7oBg9xPIpWgRGfjTMfXxkryy62PClRSt6m/mCwiZB2/N pOuWzGfBoKeCiULfwB1ZMljlxa8xBrrWd9MXYgJz82/dsvXmMXpEqqm2Fvi4fNFi1Ura BuHuE7n3DWdB/YQXbjbBighfXAM58ecHBqtkB4VoKm7hJyHSfuzOVd+th5OIRUH/au8Q AR/GgEMY8akLAw31pGuBGrknjoShtYdGA4s57At7YUZvILx8i8zcyvgdpF94ONBCJffr ZACEVXhaQ0/wz9dVUBMNy3e5mReq+XVKUYcZBL4SsRZeQgqSr3l23scTiYkys+89y7sS 3MFg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id l12si559590wmc.1.2021.08.02.01.40.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 01:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 1728ek9E006996 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 2 Aug 2021 10:40:46 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1728ejXL026449; Mon, 2 Aug 2021 10:40:46 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v2 2/4] classes: simplify tag handling in container class Date: Mon, 2 Aug 2021 10:40:39 +0200 Message-Id: <20210802084041.1320-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802084041.1320-1-henning.schild@siemens.com> References: <20210802084041.1320-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Et7LHMwSAePy 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.31.1