From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a05:6512:3295:: with SMTP id p21mr117871lfe.338.1627485734809; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls2100669lfi.2.gmail; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkrnxLD/HR2i6gYIRo27LYZGIwDFZkhrkxZrYMEkFpODBRsHU10akx7O6CLOt2pTrKDzEO X-Received: by 2002:a05:6512:20d0:: with SMTP id u16mr110372lfr.356.1627485733956; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627485733; cv=none; d=google.com; s=arc-20160816; b=XPABKcY6tPBifu0ce9US+L2BI8jzFtEq5itAinzRLVhwbij6vCMjR9R4/t6FIrPXgD ZZvnJ+qr8+uY/HD1x93EEAMWm3op5Z5PDje0kPND1O3jAuMsFveU6h3+xQ9R4qFdBkbd BEQpqykc0ytLMU/kky0IVtuH9EYFubp1uiZ9Y2HCh4wI+5J1bDpbQaE05QSf/2t9aCgA 6pgHbgM/rluYBQ7EgBQZWVGKOloTan1GRvFEU4pXyouVH4UDQ3QDLsZs942+1YoghESL wMZocV/wYSGvqafXtsb51wj3SQIwgikficXiweR1/Y64X3qajYdP5wc0OOveK/RWtl5J 208g== 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=yw1cvt2aU/RVHuho4dWkKMtRj2ahaZdZGgQJ16Pd8LjIRDGDOKwgAyUmxNXpyOIhWG bFuFGES4V3+YJ6tMXZnfE7KqZ1xXMrnQX/WWed8uZjyU8HUrHuCtp+aPhiKm4BCkqH5x qPrN5Hh7lbFQFQQFoAJ8BBnzjxjYJ6vZtLqrw8FMbJnhlw9nBdFNHIccIcamBvWTvyO3 60Z3U43URUBMb85Hu1DI1GmHzA98pnh9iy5EpWsMq6YiPyzZ4jKrQ1BhV/U3+j5221gN kt4xwhGvc5J2LmhZFe7FafUhAv5KGtitNiACB4wnKUbLrIRuKkZqkxO1mNLr+7Op4ATE cJ+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z24si15338lfq.5.2021.07.28.08.22.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 08:22:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 16SFMD0c014036 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Jul 2021 17:22:13 +0200 Received: from localhost.localdomain ([139.22.37.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16SFMC2I022883; Wed, 28 Jul 2021 17:22:12 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH 2/4] classes: simplify tag handling in container class Date: Wed, 28 Jul 2021 17:22:08 +0200 Message-Id: <20210728152210.7089-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728152210.7089-1-henning.schild@siemens.com> References: <20210728152210.7089-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: a2n6+LyY+Exe 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