From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a05:6512:3986:: with SMTP id j6mr7094279lfu.104.1627893648554; Mon, 02 Aug 2021 01:40:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f02:: with SMTP id y2ls641969lfa.3.gmail; Mon, 02 Aug 2021 01:40:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw39LWP6p8PJN0dGsbsgxp04Mlqen6j4NtHnezWkU8/WKsGDDDNX0PvuMOMomSXg/2BIRBm X-Received: by 2002:a05:6512:50c:: with SMTP id o12mr11333571lfb.97.1627893647466; Mon, 02 Aug 2021 01:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627893647; cv=none; d=google.com; s=arc-20160816; b=N1qYJtxhyPFS8Ksh7N8pv1kuk9dLF37FQlV/beOtF/fG7N3sLi+hzN4HaRGU+zmt2Q XaWHuYVB+v32Ak43VE+qbBByXVpEJbdMBJCkt6xvWEp9E96bxSP4S7csP+rwI7DuCidt jz053Y1PXmxySeLwObfizLWiUa20BOepGt9r2NtC2FOL14CAs6vnAaHDuKdvuX44DyjA lPn0KUHScnE+lglG+TzJtflEgxP8bR6ahkI0wwHLkrixSy0LFB9sUq16LdmerP8hRo5d Ro44Ku5dpi3p0wrkKIjJsW0/ZL/82KVhKY7yVuV+LTxcWdBCyEJi6U10w846II/YfiLY YcbQ== 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=gdOWlG5i/Mec3tILT+a4fx1PeSRT4hxRv9YM6YESITg=; b=TAtRPLM13eUb2+l7AYdVcmaATIJ3PdNoaD7+IRdeobCwGQxh0x064l3527MgSSn8HM ysK4xlW0di58TYewoCsli04Ev4W639EtbSzCiEn8bCjs8iIfOoUbMDgCxfxwPzPCEeqV ovtLFU+MA7i7xvpaxd6VnA30pK4dQzw4D2N1RtCubWeC2vOShrWTf2A8RXa15TFrKwZ7 WnV8jYH+OI+jVPP4ZWko9cZWEkKg+intW/btyxhYdGYxaQeiWD/AIbDxTKKdihmJaXdt RzgfO1lZPq+X06lNKECGrRg9FKWAqaM2jcBo/PihvnU99MHDnWsM5C2s9DGCq0G4BSr9 i1+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id i5si563981lfl.2.2021.08.02.01.40.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 01:40:47 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1728ekxG026467 (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 1728ejXM026449; 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 3/4] classes: allow more control over container image name and tag Date: Mon, 2 Aug 2021 10:40:40 +0200 Message-Id: <20210802084041.1320-4-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: anwOOHfIWPLc This patch allows more fine-grained control over how the resulting container will be tagged. Where the default name will be PN together with DISTRO and ARCH, and tag will be derived from PV and PR Signed-off-by: Henning Schild --- RECIPE-API-CHANGELOG.md | 4 ++++ meta/classes/container-img.bbclass | 4 +--- meta/classes/image-container-extension.bbclass | 11 ++++++----- meta/classes/image-sdk-extension.bbclass | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 806c2914f13f..284583e28120 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -292,3 +292,7 @@ Migrate your patches so they can be applied with "git am", or Kernel image name for arm64 platforms is vmlinux now. Image format was not changed (uncompressed executable) but now it is named correctly. + +### Change default "image_name:tag" when building container images + +The name used to be rather static and the tag was always "latest", now the values are derived from recipe variables PN, PV, PR. diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 79ef3e8d756b..9928a58ef53d 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -9,10 +9,8 @@ do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_container_image[vardeps] += "CONTAINER_FORMATS" do_container_image(){ - rootfs_id="${DISTRO}-${DISTRO_ARCH}" - bbdebug 1 "Generate container image in these formats: ${CONTAINER_FORMATS}" - containerize_rootfs "${IMAGE_ROOTFS}" "${rootfs_id}" "${CONTAINER_FORMATS}" + containerize_rootfs "${IMAGE_ROOTFS}" "${CONTAINER_FORMATS}" } addtask container_image before do_image after do_image_tools diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index 0e70ba9c1405..43b67f9d864d 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -6,15 +6,16 @@ # This class extends the image.bbclass for containerizing the root filesystem. CONTAINER_FORMATS ?= "docker-archive" +CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" +CONTAINER_TAG ?= "${PV}-${PR}" containerize_rootfs() { local cmd="/bin/dash" local empty_tag="empty" - local tag="latest" + local tag="${CONTAINER_TAG}" local oci_img_dir="${WORKDIR}/oci-image" local rootfs="$1" - local rootfs_id="$2" - local container_formats="$3" + local container_formats="$2" # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" @@ -42,9 +43,9 @@ containerize_rootfs() { sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" # convert the OCI container image to the desired format - image_name="isar-${rootfs_id}" + image_name="${CONTAINER_IMAGE_NAME}" for image_type in ${CONTAINER_FORMATS} ; do - image_archive="${DEPLOY_DIR_IMAGE}/${rootfs_id}-${image_type}.tar" + image_archive="${DEPLOY_DIR_IMAGE}/${image_name}-${tag}-${image_type}.tar" bbdebug 1 "Creating container image type: ${image_type}" case "${image_type}" in "docker-archive" | "oci-archive") diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 426b92595554..fa15b588068c 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -80,7 +80,7 @@ do_populate_sdk() { # generate the SDK in all the desired container formats if [ -n "${sdk_container_formats}" ] ; then bbnote "Generating SDK container in ${sdk_container_formats} format" - containerize_rootfs "${SDKCHROOT_DIR}" "sdk-${DISTRO}-${DISTRO_ARCH}" "${sdk_container_formats}" + containerize_rootfs "${SDKCHROOT_DIR}" "${sdk_container_formats}" fi } -- 2.31.1