CI: Move dependencies into CI image

- Update `dnf` command in Dockerfile to include missing dependencies
- Remove `dnf` command from `.gitlab-ci.yml` scripting
- Sort packages in `dnf` command
- Use `install_weak_deps=false` option in `dnf` to reduce image size

2 files changed, 12 insertions, 9 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29a12e85..9d46f3b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,6 @@ reference:
     variables:
         MESON_FLAGS: "-Dc_std=c11 -Dcpp_std=c++11 -Dwerror=true --buildtype=release -Dglib:tests=false -Dgtk:media-gstreamer=disabled -Dgtk:broadway-backend=false -Dgtk:demos=false -Dgtk:build-examples=false -Dgtk:build-tests=false -Dgtk:werror=false -Dlibsass:werror=false -Dsassc:werror=false -Dlibadwaita:werror=false"
     script:
-        - sudo dnf -y install git libpng-devel libjpeg-turbo-devel expat-devel
         - mkdir -p pfx/
         - meson ${MESON_FLAGS} --prefix=${PWD}/pfx -Dgtk_doc=true _build
         - ninja -C _build install
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 6ff5a2d3..4cfdeaf1 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,20 +1,24 @@
 FROM fedora:36
 
 RUN dnf update -y
-RUN dnf -y install \
+RUN dnf -y install --setopt=install_weak_deps=False \
+    clang \
+    git \
+    gi-docgen \
     meson \
-    vala \
-    libvala-devel \
-    gtk4-devel \
     ninja-build \
     pkgconf \
-    clang \
-    gi-docgen \
+    vala \
+    expat-devel \
+    gtk4-devel \
     gobject-introspection-devel \
+    libjpeg-turbo-devel \
+    libpng-devel \
+    libvala-devel \
+    sysprof-devel \
     vulkan-headers \
     wayland-devel \
-    wayland-protocols-devel \
-    sysprof-devel
+    wayland-protocols-devel
 
 RUN dnf clean all