From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a19:7017:: with SMTP id h23mr4408752lfc.532.1627910089744; Mon, 02 Aug 2021 06:14:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a592:: with SMTP id m18ls1370725ljp.11.gmail; Mon, 02 Aug 2021 06:14:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgNxlag6WGeze7qeYT07sJabaedVj+4O0BUH7aGUFld2N4uESd9lVM+W0DmTcVEN53STCX X-Received: by 2002:a2e:a723:: with SMTP id s35mr173082lje.464.1627910088639; Mon, 02 Aug 2021 06:14:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627910088; cv=none; d=google.com; s=arc-20160816; b=COLQGVk19m9XmC35QKtBW6ZMQQ/TXkGvEhnsqdwgUMLeIVXdPy/XHFAbiR6qyyjgzq hTTlXPwWGYn6Q8pQOvQsLEhSdBdW3sG/BN7Jh4J8YVyDnTO017YFXUCpagM1YaMrjAgN Ax3wyraLkIQPErSVCgNjxlWd95nsk6jukL5Vttkj0Wo554mkLHbvou3G/a10jmBRGF3u sMWQ2RBPO6QYI1ypbUDfHeRq6MLQ9rlr2ZPkUmiofb989unAMLg4ac0Q52Z2IdOpGZHu O41jEA7GVt6/+sE8U4bvayY8cOtecaMbWcq7XO3AWah9leTzYRxuEV3VCNA0AD3A/Ir5 6g1Q== 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:subject:cc:to:from:date; bh=SzQ23n1n7PT9hdpXSZdalsIfY39/FaWBJFyVlVdj5Ac=; b=Cs1CnE8FTxakeGxHyrFbdaivNPsBvHRoZQSoA5Pd11ulLOuEUVJrVvihH1Y5UDzg5L D6NflVnl5WGD4mzOgtF3bWAGIRfZB9KgNhA5lZDZ8qTR4sWdrAdU7HowEx5+f59OMs1V SbQkXIg1R0+uyRy3o58aREMfI2lTnMo5A06J2uGCQNxnLPqE0oPG/xbwxR9rjHqOmaTg 4DJaAjGlBmGN5BTiHH4qE43Tw2MdCHnlN8CHBv+CvEAMCeReIao2wgUIwUsWJAePqjgx tql961APyhQRJKjtMgg6wCuD+mXaHhhSIRr//MyPyYKyqUa2albtVdn/AvSis/x05k+C jHFA== 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 a21si215405lfk.12.2021.08.02.06.14.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 06:14:48 -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 172DElm7007272 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 2 Aug 2021 15:14:48 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 172DElja006630; Mon, 2 Aug 2021 15:14:47 +0200 Date: Mon, 2 Aug 2021 15:14:47 +0200 From: Henning Schild To: Silvano Cirujano Cuesta Cc: Subject: Re: [PATCH v3 3/4] classes: allow more control over container image name and tag Message-ID: <20210802151447.6e4e7ded@md1za8fc.ad001.siemens.net> In-Reply-To: References: <20210802115404.22707-1-henning.schild@siemens.com> <20210802115404.22707-4-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: EU7NSslwmwUe Am Mon, 2 Aug 2021 14:26:02 +0200 schrieb Silvano Cirujano Cuesta : > On 02/08/2021 13:54, Henning Schild wrote: > > 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 ++++ > > doc/user_manual.md | 8 ++++---- > > meta/classes/container-img.bbclass | 4 +--- > > meta/classes/image-container-extension.bbclass | 11 ++++++----- > > meta/classes/image-sdk-extension.bbclass | 2 +- > > 5 files changed, 16 insertions(+), 13 deletions(-) > > > > diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md > > index 806c2914f13f..d12d30e192a8 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 "TARGET_NAME:TAG" when building container images > > + > > +The "TARGET_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/doc/user_manual.md b/doc/user_manual.md index > > cf7dc2fee35e..e5c07bd41fc5 100644 --- a/doc/user_manual.md > > +++ b/doc/user_manual.md > > @@ -300,14 +300,14 @@ bitbake mc:qemuarm-buster:isar-image-base > > - Load the container image into the Docker Daemon > > > > ``` > > -docker load -i > > build/tmp/deploy/images/qemuarm/debian-buster-armhf-docker-archive.tar.xz > > +docker load -i > > build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz > > ``` > > - Run a container using the container image (following commands > > starting with `#~:` are to be run in the container) > > > > ``` > > -docker run --rm -ti --volume "$(pwd):/build" > > isar-buster-armhf:latest +docker run --rm -ti --volume > > "$(pwd):/build" isar-image-base-debian-buster-armhf:1.0-r0 ``` > > > > --- > > @@ -1070,14 +1070,14 @@ bitbake -c do_populate_sdk > > mc:qemuarm-buster:isar-image-base > > - Load the SDK container image into the Docker Daemon > > > > ``` > > -docker load -i > > build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf-docker-archive.tar.xz > > +docker load -i > > build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz > > ``` > > - Run a container using the SDK container image (following > > commands starting with `#~:` are to be run in the container) > > > > ``` > > -docker run --rm -ti --volume "$(pwd):/build" > > isar-sdk-buster-armhf:latest +docker run --rm -ti --volume > > "$(pwd):/build" isar-image-base-debian-buster-armhf:1.0-r0 ``` > > > > - Check that cross toolchains are installed > > 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..4f93d30219f9 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_TARGET_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" > > In a comment to patch v2 you mentioned your plan to call it > "CONTAINER_TARGET_IMAGE". Have you changed your mind or is it just an > error? Oh right. Picked the wrong one. > > +CONTAINER_TAG ?= "${PV}-${PR}" > > Although only container images can have tags and not containers, I > still find this name misleading for container newbies (and some ISAR > maintainers will probably be). Your argument that "docker tag" only > uses "TAG" doesn't convince me ;-) Ok ... at least you give some insights on the other comment. But you started the "CONTAINER_" thingy. Can containers (not images) have the format docker-archive ? ;) > In general I'd say that both "CONTAINER_TARGET_NAME" and > "CONTAINER_TAG" should start with the prefix "CONTAINER_IMAGE_". Both > the name and the tag are attributes of a container image. > > Therefore I'd rather use "CONTAINER_IMAGE_NAME" and > "CONTAINER_IMAGE_TAG". But since I'm neither a power user nor a power > contributor, my opinion might not be that important. Usage: docker tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG] "CONTAINER_IMAGE_" because that is the name of the class ... and pretty close to how other classes expose their "configurables" except for the weird extension pattern you took over wrong from that truly weird SDK. Which gives me CONTAINER_IMAGE_FORMATS CONTAINER_IMAGE_TAG CONTAINER_IMAGE_TARGET_IMAGE While the last one seems pretty silly ... i will still take it because is is prefix+suffix following a clear pattern. Henning > Silvano > > > > > 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_TARGET_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 > > } > > > >