From patchwork Wed Jul 28 07:22:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 612 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:08:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F83kl019094 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:08:05 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:08:03 +0200 Resent-Message-ID: <20210809150803.GU28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 28 Jul 2021 17:22:20 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 16SFMKBR032320 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Jul 2021 17:22:20 +0200 Received: by mail-lf1-f58.google.com with SMTP id i7-20020a0565123407b0290229c07c3305sf1207819lfr.11 for ; Wed, 28 Jul 2021 08:22:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627485734; cv=pass; d=google.com; s=arc-20160816; b=dKMBeH9kE3Stqp2c67ICdQRZzTWFWpwzExBw6hRXdmgkww9YuSTfxbPSS56uZj2o54 EB/KyClWKEkqkATZYcxWpID5j5pjV5BSb2atuK2E34rUT4DjkDB3ObcBCfJuffT4ubJQ fqTs5anH/hWVLuum6XUemoiTyshgJ0AvsnEfSpCknSJVLXHGkd3BR7xQbrYzAplM3Hbr Fnj85hfp1Lbf8ZLdnoqwWOKvtQ57E/d1/D8Var1emODfT1Tc3DyXXS3IAEuIARHTySjg WMrhVwK5kaeUKyIzx0aNVL90A+GPeS2JDlhAqscskfX35QJ4Cskb1Wn8lYBKuYYUZAQ6 K+4g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=+u8ODO4m5hRxI+gatWmtEcyXq72/i8oivWzRuMBSnuY=; b=ybVxA/vr10VkCn3SNaThiRxZK+B3YYL+de8AjJUdsNoEACcwOBaf+EMb8pmxj6rRGP WwqR+jaoCqSOa+NO2O2H11tKqKYB7BaAQZ3Y1GmXsnk4GwMISGlR6pQU1evR/nhoRSoZ WAiTjbmyonc0xFCUHpN6YuqDmRlc9uW3BD/fLm5nKF7dPlF/VnwiXx48GfDp9K8oPC9T y3pOlflaCDul9u0gVdi6tGElaMWHVLV1zb/OnwTexLoql8G2YRa8PQFLJNiO7ZRrC4hf SibcwYKN5ZfuxjMNCwegl9EUU6e8Uc2dqzfglB/FIsAp0Y6ZdHfVXOw96yrNHl9lZ/pB vyJg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=+u8ODO4m5hRxI+gatWmtEcyXq72/i8oivWzRuMBSnuY=; b=qSlJBAQQnJ2847iPrG+ywWw2wUbtNu7e0Fobq7uBpGkdRnEbXBhyCpb8S+c0v7aZjV t69VmGQvZWuw6bqk1o76O3/dBCQ4M37BmK4xobLJENiLtyDmwocTKiuqagOnHnaZnMXD 6Tj0dfgzJni+uF6eynK5PFteQA/5HJiwe8dSUeI3zvrprbSS0WQw3XjJ56C0k7PIWXOE YTqS04f5SNhxr5huxKrdIT7e8GufqNmk9G5lhGKLtTTGq+ZYdut6fI2TFIVRv5dbvMvu 2Ae65ow2syLjZWFvnvKkQzdBb5MKkBVAPRILDlkzfc1LFzGA96cPIIdVRVTA4N8woa2X ryPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=+u8ODO4m5hRxI+gatWmtEcyXq72/i8oivWzRuMBSnuY=; b=VhGtKWw3wRZzItyR8/ATG4gVbjK4omSiYOg8104R0Z83IeNrhiq5jJ9ayoUBaLpPt3 uYiuJ3LsRLIYtjTg4d2Nh/TS9YMlHd75ol6eOYiZhvWOeFHcdpEWJXPuQ+UFTcWK4UXj nXQjIgeIPRjKCNGHEw+5jJQxfaldjGkqFqYJ33exDabIqdXZ39PjpIpP3jKMpkWq1BOZ BquhW4DMcXHorCWvIRl0FySGYWfVCVLKgxUpyM90Q99gUpThVFZiDP2kQY2Ou2NV01mK 0uVmYyASxKieoZq22ORpD03coRsOQIKnZdMvbV8vYVtT76HelBnjavqzxApaTuDxPkkE 4k/A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532K1k/KGF0juoPiYcoazMOGwnfbnUPXva1WeyPuYSrg8l6jSfrG llwewEHBtXRQJU+KracOy50= X-Google-Smtp-Source: ABdhPJyBecp3n1b6cIv1bfSecCUdhL7JZkVwWOeQL478Pw20bhP0/DJNlI/CMRxwjPOKMjFadTircg== X-Received: by 2002:a05:6512:23a7:: with SMTP id c39mr76727lfv.603.1627485734748; 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-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 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; 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 X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX 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}"