[gvfs/wip/oholy/bind-mounts: 5/5] ci: Update docker image

[Ondrej Holy <oholy src gnome org>]

commit 37f2923a52721397950d501ff06f4e8de8a1ebc7
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Dec 7 12:21:06 2018 +0100

    ci: Update docker image
    
    New image is necessary because of new functionality. Add --no-cache
    option to force rebuilding the image.

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/Dockerfile    | 3 +--
 .gitlab-ci/run-docker.sh | 8 +++++---
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb683608..52cffc8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/gvfs/master:v2
+image: registry.gitlab.gnome.org/gnome/gvfs/master:v3
 
 build:
     stage: build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index ee6efd20..73d876cf 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -5,9 +5,8 @@ RUN dnf install -y avahi-devel avahi-glib-devel dbus-glib-devel docbook-style-xs
 
 RUN dnf install -y --best elfutils-libelf-devel gamin-devel gcc gcc-c++ gdbm gettext git glibc-devel 
glibc-headers gtk-doc libattr-devel libffi-devel libmount-devel libselinux-devel ninja-build pcre-devel 
python3-devel systemtap-sdt-devel zlib-devel \
  && dnf clean all \
- && git clone https://gitlab.gnome.org/GNOME/glib.git \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git \
  && cd glib \
- && git checkout a48692300194470f7b77ee0767a9104380d1c83c \
  && meson . _build --prefix=/usr \
  && ninja -C _build \
  && ninja -C _build install \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 0530ce96..5f8f1a01 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-set -ve
+TAG="registry.gitlab.gnome.org/gnome/gvfs/master:v3"
 
-TAG="registry.gitlab.gnome.org/gnome/gvfs/master:v2"
+if [[ "$1" == "--no-cache" ]]; then
+  NOCACHE="--no-cache"
+fi
 
-docker build -t $TAG .
+docker build $NOCACHE -t $TAG .
 
 if [[ "$1" == "--push" ]]; then
   docker login registry.gitlab.gnome.org