[glib/glib-2-56] ci: update meson

[Philip Withnall <pwithnall src gnome org>]

commit 7132abe1e6985e4e9718bf1ada4f1d094b8e51f6
Author: Christoph Reiter <creiter src gnome org>
Date:   Tue May 1 08:55:29 2018 +0200

    ci: update meson
    
    Rebuild the fedora docker image to get the newest meson release.
    
    (Backport 2.56: Tweaked by Philip Withnall <withnall endlessm com> to
    drop MSYS2 changes.)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=795711

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/run-docker.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35c667558..7bec6f867 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ebassi/gitlab-glib:latest
+image: registry.gitlab.gnome.org/gnome/glib/master:v1
 
 stages:
   - build
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 940456fad..4fc59a1d6 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,8 +2,10 @@
 
 set -e
 
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "gitlab-glib" \
+TAG="registry.gitlab.gnome.org/gnome/glib/master:v1"
+
+sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
 sudo docker run --rm \
     --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "gitlab-glib" bash
+    --tty --interactive "${TAG}" bash