[glib: 1/6] ci: Update meson to 0.47.0 in docker image

[Philip Withnall <pwithnall src gnome org>]

commit 9d73ea897561901580eaa5e77d39c8617693e928
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Tue Jul 3 11:00:20 2018 -0400

    ci: Update meson to 0.47.0 in docker image

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/Dockerfile    | 2 +-
 .gitlab-ci/run-docker.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e57122ece..5b9461328 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib/master:v5
+image: registry.gitlab.gnome.org/gnome/glib/master:v6
 
 stages:
   - build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 06944ae98..06d3a4ae3 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -48,7 +48,7 @@ RUN rm -rf $ANDROID_NDK_PATH
 
 COPY cross_file_mingw64.txt /opt
 
-RUN pip3 install meson==0.46.1
+RUN pip3 install meson==0.47.0
 
 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 59b5c8d08..91d3042e7 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/master:v5"
+TAG="registry.gitlab.gnome.org/gnome/glib/master:v6"
 
 docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .