On Wed, 2021-02-10 at 18:00 +0100, Erik Skultety wrote: > The prepare.sh script isn't currently used and forces us to make use > of sudo to switch the user inside the container from root to $USER > which created a problem on our Debian Slim-based containers which don't > have the 'sudo' package installed. > This patch removes the sudo invocation and instead runs the CMD > directly with podman. > > Summary of the changes: > - move the corresponding env variables which we need to be set in the > environment from the sudo invocation to the podman invocation > - pass --workdir to podman to retain the original behaviour we had with > sudo spawning a login shell. > - MESON_ARGS env variable doesn't need to propagated to the execution s/MESON_ARGS/MESON_OPTS/ > @@ -158,6 +159,11 @@ CI_ENGINE_ARGS = \ > --rm \ > --interactive \ > --tty \ > + --user $(CI_UID):$(CI_GID) \ > + --workdir $(CI_USER_HOME) \ Please add quotes around the arguments here. Reviewed-by: Andrea Bolognani <abologna@xxxxxxxxxx> -- Andrea Bolognani / Red Hat / Virtualization
