From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a05:600c:17d8:: with SMTP id y24mr15797814wmo.91.1628179044528; Thu, 05 Aug 2021 08:57:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1:: with SMTP id g1ls1423590wmc.3.canary-gmail; Thu, 05 Aug 2021 08:57:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZqDQX8hvjhAjr5UVMJ2SfW47099W3o/0lHNP2dMlytGwHoIHL0g0TjoJAGwW8VSWq6Hu0 X-Received: by 2002:a7b:cbcd:: with SMTP id n13mr5508238wmi.105.1628179043694; Thu, 05 Aug 2021 08:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628179043; cv=none; d=google.com; s=arc-20160816; b=baovMy/s3QzjDS3x4o8B1b2u3KvHDXzVFQCdCoTZNCTE9Q6WGTSnCPFqp0B+5qBf4l BPG7NLPQK4v4Y3eC+Ae6eboXEuPruLVy8QEkO89pyoRmheqETbAga312wR03iPioPP6E j7T4oc+wnRBFFBZT4XXRr6bWf231iMxsiaOUERYw3Fydx6d6jOVh0GRiJaL4h5GaVMvw BCwg1OQbo+IMBbcDc9hFZ6/uL+uNzjJftLyfZfiQjJjaMn8cSe1bc3OzYfxLs98GBueQ /PQ/798ayoFHTuvGoNkCo9e4q8wY94PptZ+ocdWdCcZBWkJs+uzjGaBO+bHUkoVPU3Du UsBA== 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=naRLGDpcB0Kf9v0AWILksYxJmoepY4onYfPZ+quOwa3lfjPDUVpW+tmm1aDo+rwROm iLA7grwKOYixzK38CKYXEwRGqm285KOR++0hEpIfEYeh9fEXaKId1yrRmWyNIbHO6QKg gkJqg7WP850rZXm8EzntdLyhHfivVMCujeHreYxrmxfF6GjpXOG6Cs+L4Hye/2yxbdi+ QHAnKMMs6xuJrIX7oGWqLSZyJn4w9bDuE6PKUAWg65jbVzdRPWJM/SFdAjf7VaKqLa86 KX/vbJHl0kFOXEXxjUD0KSAkt19xOyBxen/jvAJ0nytYyVsuy+Z4GD/w6y8DxxNlEEMi jNWw== 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 o83si389744wme.2.2021.08.05.08.57.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Aug 2021 08:57:23 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 175FvNl8010761 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 5 Aug 2021 17:57:23 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 175FvMeC025489; Thu, 5 Aug 2021 17:57:23 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v4 2/5] classes: simplify tag handling in container class Date: Thu, 5 Aug 2021 17:57:18 +0200 Message-Id: <20210805155721.11872-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210805155721.11872-1-henning.schild@siemens.com> References: <20210805155721.11872-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: lVeXE5kC3QqM 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