[mutter] ci: Rebase docker image to F32

[Florian Müllner <fmuellner src gnome org>]

commit ce64ab5449ca053b662d95604a3239bf5cfc2a4f
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Apr 3 23:18:28 2020 +0200

    ci: Rebase docker image to F32
    
    We have branched now, time for a shiny new CI image.
    
    Update the Dockerfile to:
    
     - switch to F32
     - use a single shared copr
     - drop dependencies that are now covered by builddep
     - do not include weak deps
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1176

 .gitlab-ci.yml        |  2 +-
 .gitlab-ci/Dockerfile | 21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0db8f061b..0e2fbbcae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/mutter/master:v3
+image: registry.gitlab.gnome.org/gnome/mutter/master:v4
 
 stages:
  - review
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 393c76394..c3913793a 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,32 +1,27 @@
 # Rebuild and push with
 #
 #     cd .gitlab-ci/
-#     podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v3 .
-#     podman push registry.gitlab.gnome.org/gnome/mutter/master:v3
+#     podman build --format docker --no-cache -t registry.gitlab.gnome.org/gnome/mutter/master:v4 .
+#     podman push registry.gitlab.gnome.org/gnome/mutter/master:v4
 #
 
-FROM fedora:31
+FROM fedora:32
 
 RUN dnf -y update && dnf -y upgrade && \
     dnf install -y 'dnf-command(builddep)' && \
     dnf install -y 'dnf-command(copr)' && \
-    dnf copr enable -y fmuellner/gnome-shell-ci && \
     dnf copr enable -y jadahl/mutter-ci && \
-    dnf -y update && dnf -y upgrade && \
 
-    dnf builddep -y mutter && \
-
-    # Until Fedora catches up with new build-deps
-    dnf install -y 'pkgconfig(graphene-gobject-1.0)' 'pkgconfig(sysprof-capture-3)' && \
+    dnf builddep -y mutter --setopt=install_weak_deps=False && \
 
     # For running unit tests
-    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 '*/xvfb-run' gdm-lib 
accountsservice-libs gnome-control-center && \
+    dnf install -y xorg-x11-server-Xvfb mesa-dri-drivers dbus dbus-x11 \
+        '*/xvfb-run' gdm-lib accountsservice-libs gnome-control-center \
+        --setopt=install_weak_deps=False && \
 
     # GNOME Shell
     dnf builddep -y gnome-shell --setopt=install_weak_deps=False && \
-    dnf remove -y gnome-bluetooth-libs-devel dbus-glib-devel upower-devel python3-devel && \
+    dnf remove -y gnome-bluetooth-libs-devel && \
     dnf remove -y --noautoremove mutter mutter-devel && \
 
-    dnf upgrade -y 'pkgconfig(libpipewire-0.3)' && \
-
     dnf clean all