From 8661d94c3e70a502bc8f023ecabba5ceec2abb06 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Mon, 13 Jan 2020 12:46:01 -0500
Subject: [PATCH] ci: Install some missing packages in fedora docker image

---
 .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 46d750435..20fbf2fef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,9 +98,6 @@ installed-tests:
   extends: .only-default
   image: $FEDORA_IMAGE
   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