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 <andrew.cooper3@citrix.com>
---
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
CC: Anthony PERARD <anthony.perard@vates.tech>
---
.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:
.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:
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-build.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=linux/amd64 alpine:3.18
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
-WORKDIR /build/
-
RUN apk --no-cache add bash
RUN bash -ex <<EOF
- adduser -D xenproject --shell bash
+ adduser -D user --shell bash
DEPS=(
musl-dev
@@ -29,3 +27,6 @@ RUN bash -ex <<EOF
apk add --no-cache "\${DEPS[@]}"
EOF
+
+USER user
+WORKDIR /build
--
2.39.5