[gtk/f16c.msvc: 33/61] ci: Drop the split Fedora images

[Chun-wei Fan <fanchunwei src gnome org>]

commit e3477519e821892e3f029c2ae34e9ea521ce2db2
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Apr 9 12:28:08 2021 +0100

    ci: Drop the split Fedora images
    
    Now that we don't need the whole of Pandoc to build our documentation,
    we can go back to a single Fedora image for our CI.

 .gitlab-ci.yml                    |  4 +-
 .gitlab-ci/fedora-base.Dockerfile | 89 ------------------------------------
 .gitlab-ci/fedora-docs.Dockerfile | 18 --------
 .gitlab-ci/fedora.Dockerfile      | 94 ++++++++++++++++++++++++++++++++++++++-
 4 files changed, 95 insertions(+), 110 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a41fae5b7f..59dc2e6fec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,9 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v29"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v27"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v29"
 
 .only-default:
   only:
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index c64f0947b7..6f24276c04 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,96 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
+FROM fedora:33
+
+RUN dnf -y install \
+    adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
+    avahi-gobject-devel \
+    cairo-devel \
+    cairo-gobject-devel \
+    ccache \
+    clang \
+    clang-analyzer \
+    colord-devel \
+    cups-devel \
+    dbus-daemon \
+    dbus-x11 \
+    dejavu-sans-mono-fonts \
+    desktop-file-utils \
+    diffutils \
+    elfutils-libelf-devel \
+    fribidi-devel \
+    gcc \
+    gcc-c++ \
+    gdk-pixbuf2-devel \
+    gdk-pixbuf2-modules \
+    gettext \
+    git \
+    glib2-devel \
+    glib2-static \
+    glibc-devel \
+    glibc-headers \
+    gnome-desktop-testing \
+    gobject-introspection-devel \
+    graphene-devel \
+    graphviz \
+    gstreamer1-devel \
+    gstreamer1-plugins-good \
+    gstreamer1-plugins-bad-free-devel \
+    gstreamer1-plugins-base-devel \
+    gtk-doc \
+    hicolor-icon-theme \
+    iso-codes \
+    itstool \
+    json-glib-devel \
+    lcov \
+    libasan \
+    libattr-devel \
+    libcloudproviders-devel \
+    libepoxy-devel \
+    libffi-devel \
+    libmount-devel \
+    librsvg2 \
+    libselinux-devel \
+    libubsan \
+    libXcomposite-devel \
+    libXcursor-devel \
+    libXcursor-devel \
+    libXdamage-devel \
+    libXfixes-devel \
+    libXi-devel \
+    libXinerama-devel \
+    libxkbcommon-devel \
+    libXrandr-devel \
+    libXrender-devel \
+    libXtst-devel \
+    libxslt \
+    mesa-dri-drivers \
+    mesa-libEGL-devel \
+    mesa-libGLES-devel \
+    meson \
+    ninja-build \
+    pango-devel \
+    pcre-devel \
+    pcre-static \
+    python3 \
+    python3-jinja2 \
+    python3-markdown \
+    python3-pip \
+    python3-pygments \
+    python3-toml \
+    python3-typogrify \
+    python3-wheel \
+    redhat-rpm-config \
+    sassc \
+    systemtap-sdt-devel \
+    vulkan-devel \
+    wayland-devel \
+    wayland-protocols-devel \
+    weston \
+    weston-libs \
+    which \
+    xorg-x11-server-Xvfb \
+ && dnf clean all
 
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers