From nobody Mon Feb 9 22:24:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744216663; cv=none; d=zohomail.com; s=zohoarc; b=emgLhkqGy1suSBf9hbhU8dMm2gjq1kldDjSb2rcG2ajxr27y3Lu6ukb0+lTLfxc6vUtfKMwFqwFOUdoLsI4Pru0pVeCXge4JK5MKw5IisrJ7LyrK73gxcOXtbiv2Lx0vrNu9Aylvw7eLVcuJi7yFifLGt4mfbNf57yTxcumuR5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216663; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WikkQXD4kZveDb/959Oc1/hEF4sz0oUbKzkkNBhCfIM=; b=FLxHvUFnIQRvQKdjxQTXW/PTZPnn3UgnjEp5nfmXZwfzHjCcYw8isSU/OAhH6BSIm0j1nOQ6mX15t9Kfz8WCEYOdmAWtnH0rw3YqOUKsEtvL71cAYjG8kHTPVMG3V88WV7V6DeX9VvznqFxFFDAiEIQ4UEX7JU8afpdM1wlkboI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744216663161408.47269577824727; Wed, 9 Apr 2025 09:37:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944342.1342841 (Exim 4.92) (envelope-from ) id 1u2YQK-00059n-MA; Wed, 09 Apr 2025 16:37:12 +0000 Received: by outflank-mailman (output) from mailman id 944342.1342841; Wed, 09 Apr 2025 16:37:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQK-00058u-FK; Wed, 09 Apr 2025 16:37:12 +0000 Received: by outflank-mailman (input) for mailman id 944342; Wed, 09 Apr 2025 16:37:11 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQJ-0004rn-AF for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:11 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e1603400-1560-11f0-9ffb-bf95429c2676; Wed, 09 Apr 2025 18:37:09 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf3192f3bso67469545e9.1 for ; Wed, 09 Apr 2025 09:37:09 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f233c817dsm20947455e9.23.2025.04.09.09.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:08 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e1603400-1560-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216628; x=1744821428; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WikkQXD4kZveDb/959Oc1/hEF4sz0oUbKzkkNBhCfIM=; b=WDeKvUD/gRn3S2eHJP3inoGO+JI82WAIo7qrDmG5+mIn9xPAN6XLKoX9ysh9K+uw9+ 765b0j4ynVwI9msk/yx5i5seM9YBKtlxGIa2Foad5uoD+yDacP6tY1ZDZ+a+2u+vJR4s zmvWicNTsjTpNL7c/Ba4Y9A6usnS4yOih60TE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216628; x=1744821428; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WikkQXD4kZveDb/959Oc1/hEF4sz0oUbKzkkNBhCfIM=; b=a6u36UwCLS++tEXi5goC31wJZE6I9WxZs6/a9hV785H9SWYYZ4r+yeDpWzwlC+JkNE G0yu2ffgWzsGkGDTKKvEG18nYfd9L08aHGQcpvQ/wsHJs7QHEEUEaBwfeMmBC0dmWAbw cHT8V2GGxDUVPkupXYqdghp5FB1NeJi1X6JXNV9zMpqw1hxoZgQx5eHyfMjFIlwA5Gll XTBGeT2tacfVXB77YOWX1oQ2Aqj96D1Xv0tnjRkOnFroH9oh3sGOigAg6fGm89LKbB25 RhI3x+RmJNjiMrtDUZdKz4ue1O8lU3lWdpIUZdSS65LwQ0D/jgyS+jzf+uMTSmH69VTP wfpw== X-Gm-Message-State: AOJu0Yxj7qTn+lww3YIIzfc2h7Q0LtI53Pk/4VPrysEzvwNAuXRMjS0z +RVDW+P4uLdw9QzLlv4RDZ65QTXBQFY8FSbCmHuEzcppmjKFUfXdodISqFRJXRcnV+VkbAjci6V zuwU= X-Gm-Gg: ASbGncsjlpvnhHJZxIZSh07yk/pNd4B6smdz/X46ke9UthEhSRbzASS4Cv1mZUZu4IH 1R7MFbwDjddjARS+/DY/SbMMMhW26lWSDYZFOq1jGXpZePCrsmsxSgkVyNLyOCzHL3wmziK9S0m A7CcMXQB/YnVwnveWNaqMFn/ot4cN03O1yozJ7sVGf89SdVq6PXJhK0p8W+Ni2kqQln/skkzOsf 7tlWjEXmte+3tYSLozT88bKx5hCdoOWMvQPobh40kz0MNAsxCUBzUrvTVIgAzngc68DTGydQTvz y1yVlWtWAXueWgzjYpJVvAzqXzLSN6OAGpKwEN+ioDEMBlGEI2oKeAZZT1+3DtJKiDa+UcO3BKB tWuBQ/P3lWqMmCQ== X-Google-Smtp-Source: AGHT+IHtUt26LX66Z0WBU4goSEbOVUNSP/4DzsgdbS77DKLY2GKN4mLBaOOitfkuKxGmYoyvBI2YiQ== X-Received: by 2002:a05:600c:1909:b0:43d:b32:40aa with SMTP id 5b1f17b1804b1-43f1ec0d15dmr36404445e9.3.1744216628397; Wed, 09 Apr 2025 09:37:08 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 2/8] Port containerise Date: Wed, 9 Apr 2025 17:36:56 +0100 Message-Id: <20250409163702.2037301-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744216664445019000 While it pains me to keep the wrong spelling, do so for consistency. Signed-off-by: Andrew Cooper --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- containerize | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100755 containerize diff --git a/containerize b/containerize new file mode 100755 index 000000000000..c32e40f5a6d9 --- /dev/null +++ b/containerize @@ -0,0 +1,94 @@ +#!/bin/bash + +# +# DOCKER_CMD should be either `docker` or `podman`. +# +# if using (rootless) podman, remember to set /etc/subuid +# and /etc/subgid. +# +docker_cmd=3D${DOCKER_CMD:-"docker"} +[ "$DOCKER_CMD" =3D "podman" ] && userns_podman=3D"--userns=3Dkeep-id" sel= inux=3D",z" + +einfo() { + echo "$*" >&2 +} + +die() { + echo "$*" >&2 + exit 1 +} + +# +# The caller is expected to override the CONTAINER environment +# variable with the container they wish to launch. +# +BASE=3D"registry.gitlab.com/xen-project/hardware/test-artifacts" +case "_${CONTAINER}" in + _alpine-x86_64-base) CONTAINER=3D"${BASE}/alpine:x86_64-base" ;; + _alpine-x86_64-build|_) CONTAINER=3D"${BASE}/alpine:x86_64-build" ;; +esac + +# Use this variable to control whether root should be used +case "_${CONTAINER_UID0}" in + _1) userarg=3D"-u 0" ;; + _0|_) userarg=3D"-u $(id -u) $userns_podman" ;; +esac + +# Save the commands for future use +cmd=3D("$@") + +# If no command was specified, just drop us into a shell if we're interact= ive +[ $# -eq 0 ] && tty -s && cmd=3D("/bin/bash") + +# Are we in an interactive terminal? +tty -s && termint=3Dt + +# +# Fetch the latest version of the container in hub.docker.com, +# unless it's a newly created local copy. +# +if [[ "_${CONTAINER_NO_PULL}" !=3D "_1" ]]; then + einfo "*** Ensuring ${CONTAINER} is up to date" + ${docker_cmd} pull ${CONTAINER} > /dev/null || \ + die "Failed to update container" +fi + +if hash greadlink > /dev/null 2>&1; then + READLINK=3Dgreadlink +elif [[ $(uname -s) =3D=3D "Darwin" ]]; then + echo "Unable to forward SSH agent without coreutils installed" + unset SSH_AUTH_SOCK +else + READLINK=3Dreadlink +fi + +# Ensure we've got what we need for SSH_AUTH_SOCK +if [[ -n ${SSH_AUTH_SOCK} ]]; then + fullpath_sock=3D$(${READLINK} -f ${SSH_AUTH_SOCK} 2> /dev/null) + if [ $? -ne 0 ]; then + echo "Invalid SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}" + unset SSH_AUTH_SOCK + else + SSH_AUTH_DIR=3D$(dirname ${fullpath_sock}) + SSH_AUTH_NAME=3D$(basename ${fullpath_sock}) + fi +fi + +# Figure out the base of what we want as our sources +# by using the top of the git repo +if [[ -z ${CONTAINER_PATH} ]]; then + CONTAINER_PATH=3D$(git rev-parse --show-toplevel) +fi + +# Kick off Docker +einfo "*** Launching container ..." +exec ${docker_cmd} run \ + ${userarg} \ + ${SSH_AUTH_SOCK:+-e SSH_AUTH_SOCK=3D"/tmp/ssh-agent/${SSH_AUTH_NAME}"}= \ + -v "${CONTAINER_PATH}":/build:rw${selinux} \ + -v "${HOME}/.ssh":/root/.ssh:ro \ + ${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent${selinux}} \ + ${CONTAINER_ARGS} \ + -${termint}i --rm -- \ + ${CONTAINER} \ + "${cmd[@]}" --=20 2.39.5