From 24fcfa91b14ec1ed5509691e1665d5fec3e28089 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <creiter@src.gnome.org>
Date: Tue, 30 Apr 2019 15:15:47 +0200
Subject: [PATCH] CI: update docker image to fedora 30

So we don't have to build glib as a subproject.
---
 .gitlab-ci.yml           | 4 ++--
 .gitlab-ci/Dockerfile    | 8 ++++----
 .gitlab-ci/run-docker.sh | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbd9e09728..5a17726696 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
     - subprojects/pango/
 
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v5
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -101,7 +101,7 @@ flatpak-master:icon-browser:
   <<: *flatpak-master
 
 pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v4
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
   stage: deploy 
   script:
     - meson -Ddocumentation=true _build .
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 57b1983fda..a9c011d456 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM fedora:30
 
 RUN dnf -y install \
     hicolor-icon-theme \
@@ -11,6 +11,7 @@ RUN dnf -y install \
     ccache \
     colord-devel \
     cups-devel \
+    dbus-daemon \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     elfutils-libelf-devel \
@@ -59,6 +60,7 @@ RUN dnf -y install \
     pango-devel \
     pcre-devel \
     python3 \
+    python3-jinja2 \
     python3-pip \
     python3-wheel \
     redhat-rpm-config \
@@ -71,9 +73,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.50.0
-
-RUN pip3 install jinja2
+RUN pip3 install meson==0.50.1
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index bcc8d7d076..b0857777ee 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v4"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .