[glib-networking/mcatanzaro/ci-v15] Build CI image with glib master

[Michael Catanzaro <mcatanzaro src gnome org>]

commit b84cf7816044fda0b686e32ffb830c737784b680
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Wed Oct 7 13:38:05 2020 -0500

    Build CI image with glib master
    
    This will allow us to test the new PKCS#11 API.

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/Dockerfile    | 9 +++++++++
 .gitlab-ci/run-docker.sh | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a48908ec..9b1f1efa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v14
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v15
 
 fedora-x86_64:
   stage: build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 8c14a2cf..3a4e9de3 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -9,6 +9,15 @@ RUN dnf update -y \
                       openssl-devel \
     && dnf clean all
 
+# Build our own glib
+RUN dnf install -y git \
+    && git clone --depth=1 https://gitlab.gnome.org/GNOME/glib.git \
+    && mkdir -p glib/_build \
+    && cd glib/_build \
+    && meson .. --prefix=/usr \
+    && meson compile \
+    && meson install
+
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 117f344a..7a7318b4 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/glib-networking/master:v14"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v15"
 
 cd "$(dirname "$0")"