From nobody Mon Feb 9 22:24:28 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=1744216649; cv=none; d=zohomail.com; s=zohoarc; b=F7sb6NKl31xOkFkkB0Mi2z9VvzGHG/COVIP0J8IhXtzgla9IGdF9/jIv7Vv8/Nx8H9aP3CqaS2jcN89Z+/NAfJ+e9ckUQzMQRbHFHf2VopoEoy/4Rhb50ODVq1S+3tSJgj6fBQ/LzHws9vQeV/mNnPl5lm4RnZfGPaY5Ww9NKMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216649; 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=HPj2BkEUlG19zfMbN8eKndFls2Zns5SZnbPzD3KxiXw=; b=IAb/O7H7GNvtrcdwTp5neUFLNjqnO2iicqF7Ho1DiNvFTdDovVcQy2iui6WkKd273tS2aQwLECHOZTDqxxWYgjT5gR3P+YfnW2ENqee3P0RHz3ftOgMmlgRilJy1klXIxlEE/UzXZBm3ng8YBcpkusOxStKX0QNii5X/msnGf6Q= 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 1744216649779908.8115165200339; Wed, 9 Apr 2025 09:37:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944340.1342824 (Exim 4.92) (envelope-from ) id 1u2YQJ-0004s9-4m; Wed, 09 Apr 2025 16:37:11 +0000 Received: by outflank-mailman (output) from mailman id 944340.1342824; Wed, 09 Apr 2025 16:37:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQJ-0004s2-23; Wed, 09 Apr 2025 16:37:11 +0000 Received: by outflank-mailman (input) for mailman id 944340; Wed, 09 Apr 2025 16:37:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQI-0004du-Fz for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:10 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e1d912c0-1560-11f0-9eab-5ba50f476ded; Wed, 09 Apr 2025 18:37:10 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfdc2c8c9so41017625e9.2 for ; Wed, 09 Apr 2025 09:37:10 -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.08 (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: e1d912c0-1560-11f0-9eab-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216629; x=1744821429; 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=HPj2BkEUlG19zfMbN8eKndFls2Zns5SZnbPzD3KxiXw=; b=GwDU6u2JfWP9nKc/jsTflcNXZc/ldRL2c9KHd8eMtnuy01+p9g7NPV1aQe9qTQ3/Y0 rYW5SIv+j9kbskPGEoylAz4DYAw3PcnrStceBdm5da7SbspMxfK03XdAN06FAJ1DyZm4 EErAHaTwVxXZi49BttxMPiwM6HgPaVa+RQSow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216629; x=1744821429; 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=HPj2BkEUlG19zfMbN8eKndFls2Zns5SZnbPzD3KxiXw=; b=LjNlczB6I1leIZlO59FThG6xM6e5MPwC8G9QHN4jhbot9yAJ03PyO5ejUVVGnm1RZb MKAiiXoQPIlJkBQoUeCA7f6BnpvfV+eiP7BgVL431d9XR+INM3JP0DeLDj2hJa6x1g0B y1n6PtmxnUtAbtp2+zgF2qa4S2efJ7vIE2SUTckDd7BMdp7IUPUSuXWMRBHECPBFZKLP 5PXOFq49/kJsBoEUgpk3dM5BzoXcq0zT6GaWOHWPVhVr55NNDXkzwcWlpvSivVcvIaiO Xi9X7J98Yxdup9l4Hmn268GnIp/Az1fvwFCSEaofXTIwVi4GV7qtzRCX6h1w926kvJLO AwsQ== X-Gm-Message-State: AOJu0Yyyhy9pnvZDjwdFdh5XsRV5wnqlHM7B9YLWGF1W170vbdiUxcD2 /wgRUAb3CwMqUEcua7633mVJ08KHU42kR/gkGlKfPDZMTeU1q5lMsIf6fLuVf4CoYaDu+57StI7 G4Hc= X-Gm-Gg: ASbGncsR8xRvy1HmM7M/WcI3OCICuWHOD0+d+RMD9Y/Nh3BVbLUZ3/+UXM/mdCB3zUP sUrez0cxFdxD96Xp9D9gdAIrqpgRa5pVQSAO3izcG51Zee9aMoMxL4+EPYfuH9Dwz1TYDmLXfO8 QIQXEieVUyPw93gJ/bD95udJ1Vda27YgTk1ZnF+cdlTZEUH1FvSpHdmOo3B2gAWvn9ujaTuzQb/ OrRvpBFk35uRe+HNwscOG8y9D7Z4xqR0fsT+qNNJAcb8NcXFvKTDVE87Dcgx4UqdTHjPycrJoPd IBivQQ9V8S1RG7SS4xRdh8pT4xWUHxh+f+BVSfIik4Rp9el8TMCKZEzE2/jF5HfTTP+1V6WNr47 ddVuUXcIfmAd5wQ== X-Google-Smtp-Source: AGHT+IEhNqBFFFM0nTh5hLtgrHCJrROHI9w4zseqll/oh/0Ofo7RMHkm7cZtluTAVt65V+deuommFA== X-Received: by 2002:a05:600c:1c02:b0:43b:c5a3:2e1a with SMTP id 5b1f17b1804b1-43f1ec7cc9cmr38097685e9.2.1744216629188; Wed, 09 Apr 2025 09:37:09 -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 3/8] Fix container user setup Date: Wed, 9 Apr 2025 17:36:57 +0100 Message-Id: <20250409163702.2037301-4-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: 1744216650764019000 Use USER (and 'user' as normal), rather than specifying configuration from = the outside. This also fixes the fact that root-needing containers need to override the default. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- .gitlab-ci.yml | 7 ------- images/alpine/x86_64-build.dockerfile | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e18a87b3a07..36ec6a7e1ee5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,10 +14,6 @@ workflow: =20 .x86_64-artifacts: extends: .artifacts - image: - docker: - platform: linux/amd64 - user: xenproject tags: - x86_64 variables: @@ -32,9 +28,6 @@ x86_64-kernel-linux-6.6.56: =20 x86_64-rootfs-alpine-3.18: extends: .x86_64-artifacts - image: - docker: - user: root script: - . scripts/x86_64-rootfs-alpine.sh variables: diff --git a/images/alpine/x86_64-build.dockerfile b/images/alpine/x86_64-b= uild.dockerfile index 3bfd17248d0a..6bfdb6ff5a0c 100644 --- a/images/alpine/x86_64-build.dockerfile +++ b/images/alpine/x86_64-build.dockerfile @@ -3,12 +3,10 @@ FROM --platform=3Dlinux/amd64 alpine:3.18 LABEL maintainer.name=3D"The Xen Project" \ maintainer.email=3D"xen-devel@lists.xenproject.org" =20 -WORKDIR /build/ - RUN apk --no-cache add bash =20 RUN bash -ex <