isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "ci: Wrap calls with sudo when building toolbox"

Browse Source 
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 ee384d85da.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2813>
This commit is contained in:
Florian Müllner 2023-06-28 23:37:59 +02:00
parent 1b974beec5
commit e31672cc42
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci/build-toolbox-image.sh
View File

@ -15,10 +15,6 @@ check_image_base() {
[[ "$base" == "$MUTTER_CI_IMAGE" ]] [[ "$base" == "$MUTTER_CI_IMAGE" ]]
} }
buildah_run() {
buildah run $build_cntr sudo "$@"
}
build_container() { build_container() {
echo Building $TOOLBOX_IMAGE from $MUTTER_CI_IMAGE echo Building $TOOLBOX_IMAGE from $MUTTER_CI_IMAGE
@ -39,10 +35,10 @@ build_container() {
abattis-cantarell-fonts # system font abattis-cantarell-fonts # system font
gnome-backgrounds # no blank background! gnome-backgrounds # no blank background!
) )
buildah_run dnf config-manager --set-disabled '*-modular,*-openh264' buildah run $build_cntr dnf config-manager --set-disabled '*-modular,*-openh264'
buildah_run dnf install -y "${extra_packages[@]}" buildah run $build_cntr dnf install -y "${extra_packages[@]}"
buildah_run dnf clean all buildah run $build_cntr dnf clean all
buildah_run rm -rf /var/lib/cache/dnf buildah run $build_cntr rm -rf /var/lib/cache/dnf
# work around non-working pkexec # work around non-working pkexec
local fake_pkexec=$(mktemp) local fake_pkexec=$(mktemp)
@ -56,7 +52,7 @@ build_container() {
# it either asks for unlocking the login keyring on startup, or it detects # 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 # the running host daemon and doesn't export the object on the bus, which
# blocks the activating service until it hits the timeout # 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)) local srcdir=$(realpath $(dirname $0))
buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec buildah copy --chmod 755 $build_cntr $srcdir/install-meson-project.sh /usr/libexec