[gvfs] ci: Use image with glib master



commit 26cd85ea61fc3f126f969c1a0a257a49fd61c9b5
Author: Ondrej Holy <oholy redhat com>
Date:   Tue Jul 10 15:14:31 2018 +0200

    ci: Use image with glib master
    
    It often happens that Fedora rawhide doesn't contain the latest GLib,
    or even GLib is not yet released, which breaks CI for new features.
    Let's include the latest Glib in our Docker image.

 .gitlab-ci.yml           |  2 +-
 .gitlab-ci/Dockerfile    | 13 ++++++++++++-
 .gitlab-ci/run-docker.sh | 12 ++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c6a2729..cdb72981 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/gvfs/master
+image: registry.gitlab.gnome.org/gnome/gvfs/master:v1
 
 build:
     stage: build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 4828fc8c..ce6c40ac 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,3 +1,14 @@
 FROM fedora:rawhide
 
-RUN dnf install -y avahi-devel avahi-glib-devel dbus-glib-devel docbook-style-xsl fuse-devel gcc gcr-devel 
gettext-devel glib2-devel gnome-online-accounts-devel libarchive-devel libbluray-devel libcap-devel 
libcdio-paranoia-devel libexif-devel libgcrypt-devel libgdata-devel libgphoto2-devel libgudev-devel 
libimobiledevice-devel libmtp-devel libnfs-devel libplist-devel libsecret-devel libsmbclient-devel 
libsoup-devel libtalloc-devel libudisks2-devel libusb-devel libxslt-devel meson openssh-clients 
pkgconf-pkg-config polkit-devel systemd-devel && dnf clean all
+RUN dnf install -y avahi-devel avahi-glib-devel dbus-glib-devel docbook-style-xsl fuse-devel gcc gcr-devel 
gettext-devel glib2-devel gnome-online-accounts-devel libarchive-devel libbluray-devel libcap-devel 
libcdio-paranoia-devel libexif-devel libgcrypt-devel libgdata-devel libgphoto2-devel libgudev-devel 
libimobiledevice-devel libmtp-devel libnfs-devel libplist-devel libsecret-devel libsmbclient-devel 
libsoup-devel libtalloc-devel libudisks2-devel libusb-devel libxslt-devel meson openssh-clients 
pkgconf-pkg-config polkit-devel systemd-devel \
+ && dnf clean all
+
+RUN dnf install -y elfutils-libelf-devel gamin-devel gcc gcc-c++ 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 --depth 1 https://gitlab.gnome.org/GNOME/glib.git \
+ && cd glib \
+ && meson . _build --prefix=/usr \
+ && ninja -C _build \
+ && ninja -C _build install \
+ && cd .. \
+ && rm -rf glib
\ No newline at end of file
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
new file mode 100755
index 00000000..61ba9c6b
--- /dev/null
+++ b/.gitlab-ci/run-docker.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -ve
+
+TAG="registry.gitlab.gnome.org/gnome/gvfs/master:v1"
+
+docker build -t $TAG .
+
+if [[ "$1" == "--push" ]]; then
+  docker login registry.gitlab.gnome.org
+  docker push $TAG
+fi
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]