From e31672cc423621cff3a2b865431a6d4ac1fe662d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 28 Jun 2023 23:37:59 +0200 Subject: [PATCH] Revert "ci: Wrap calls with sudo when building toolbox" This was necessary after mutter configured a non-root user for the image, although as it turned out not sufficient. The latest image no longer sets up a special user, so building the toolbox image should work again as before. This reverts commit ee384d85dac1b0582613bea9263424c9c197839e. Part-of: --- .gitlab-ci/build-toolbox-image.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/build-toolbox-image.sh b/.gitlab-ci/build-toolbox-image.sh index bd5e9e64a..2e07cb131 100755 --- a/.gitlab-ci/build-toolbox-image.sh +++ b/.gitlab-ci/build-toolbox-image.sh @@ -15,10 +15,6 @@ check_image_base() { [[ "$base" == "$MUTTER_CI_IMAGE" ]] } -buildah_run() { - buildah run $build_cntr sudo "$@" -} - build_container() { echo Building $TOOLBOX_IMAGE from $MUTTER_CI_IMAGE @@ -39,10 +35,10 @@ build_container() { abattis-cantarell-fonts # system font gnome-backgrounds # no blank background! ) - 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 + 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 # work around non-working pkexec local fake_pkexec=$(mktemp) @@ -56,7 +52,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 rm /usr/share/dbus-1/services/org.freedesktop.secrets.service + buildah run $build_cntr 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