diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-12-07 12:21:06 +0100 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-12-07 12:24:01 +0000 |
| commit | 37f2923a52721397950d501ff06f4e8de8a1ebc7 (patch) | |
| tree | 5eee20ca5c1ecf4b2c0167f99c4b0757dfd1b0e5 /.gitlab-ci | |
| parent | a041512cf791e8a827b94e805f8bdf192af977a2 (diff) | |
| download | gvfs-37f2923a52721397950d501ff06f4e8de8a1ebc7.tar.gz | |
ci: Update docker image
New image is necessary because of new functionality. Add --no-cache
option to force rebuilding the image.
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/Dockerfile | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 8 |
2 files changed, 6 insertions, 5 deletions
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 |