From ee384d85dac1b0582613bea9263424c9c197839e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 20 Jun 2023 02:21:47 +0200 Subject: [PATCH] ci: Wrap calls with sudo when building toolbox The mutter image now sets up a non-root default user, so we have to wrap everything with sudo or su. Part-of: --- .gitlab-ci/build-toolbox-image.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh index 2e07cb131..bd5e9e64a 100755 --- a/.gitlab-ci/build-toolbox-image.sh +++ b/.gitlab-ci/build-toolbox-image.sh @@ -15,6 +15,10 @@ check_image_base() { [[ "$base" == "$MUTTER_CI_IMAGE" ]] } +buildah_run() { + buildah run $build_cntr sudo "$@" +} + build_container() { echo Building $TOOLBOX_IMAGE from $MUTTER_CI_IMAGE @@ -35,10 +39,10 @@ build_container() { abattis-cantarell-fonts # system font gnome-backgrounds # no blank background! ) - buildah run $build_cntr dnf config-manager --set-disabled '*-modular,*-openh264' - buildah run $build_cntr dnf install -y "${extra_packages[@]}" - buildah run $build_cntr dnf clean all - buildah run $build_cntr rm -rf /var/lib/cache/dnf + buildah_run dnf config-manager --set-disabled '*-modular,*-openh264' + buildah_run dnf install -y "${extra_packages[@]}" + buildah_run dnf clean all + buildah_run rm -rf /var/lib/cache/dnf # work around non-working pkexec local fake_pkexec=$(mktemp) @@ -52,7 +56,7 @@ build_container() { # it either asks for unlocking the login keyring on startup, or it detects # the running host daemon and doesn't export the object on the bus, which # blocks the activating service until it hits the timeout - buildah run $build_cntr rm /usr/share/dbus-1/services/org.freedesktop.secrets.service + buildah_run rm /usr/share/dbus-1/services/org.freedesktop.secrets.service local srcdir=$(realpath $(dirname $0)) buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec