[glib/wip/hadess/update-docker-packages: 15/17] ci: Install a few packages directly in the Docker image

[Bastien Nocera <hadess src gnome org>]

commit 804481fc633bbc1835615167f74303379daf63cb
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Dec 11 17:46:39 2019 +0100

    ci: Install a few packages directly in the Docker image
    
    Install those in the Docker image rather than manually for each CI run.

 .gitlab-ci.yml               | 3 ---
 .gitlab-ci/fedora.Dockerfile | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab6d1d13e..d865ed476 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,9 +94,6 @@ installed-tests:
   extends: .only-default
   image: registry.gitlab.gnome.org/gnome/glib/fedora:v5
   stage: build
-  before_script:
-    # FIXME move to docker image
-    - sudo dnf install -y gnome-desktop-testing python3-dbusmock xdg-desktop-portal
   script:
     # FIXME Install xdg-desktop-portal build deps before compiling glib,
     # so it doesn't overwrite our own glib build
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index ceae6f69a..eee30d342 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -43,12 +43,14 @@ RUN dnf -y install \
     ncurses-compat-libs \
     ninja-build \
     pcre-devel \
+    python3-dbusmock \
     python3-wheel \
     shared-mime-info \
     systemtap-sdt-devel \
     unzip \
     valgrind \
     wget \
+    xdg-desktop-portal \
     xz \
     zlib-devel \
  && dnf clean all