[gvfs] ci: Simplify Dockerfile using dnf-builddep



commit d342a4743ea019e1b31a6865f4d4f680e7b8db3c
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Oct 15 15:52:08 2021 +0200

    ci: Simplify Dockerfile using dnf-builddep
    
    Currently, each dependency is listed explicitely in Dockerfile. Let's simplify
    it using the dnf-builddep plugin.

 .gitlab-ci/Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 455c938a..d398d340 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,9 +1,10 @@
 FROM fedora:latest
 
-RUN dnf install -y --nogpg avahi-devel avahi-glib-devel dbus-glib-devel docbook-style-xsl fuse3-devel gcc 
gcr-devel gettext-devel glib2-devel gnome-online-accounts-devel gsettings-desktop-schemas-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 gnome-desktop-testing 
dbus-daemon python3-twisted python3-gobject procps-ng bzip2 httpd mod_ssl openssh-server passwd \
+RUN dnf install --nogpg -y dnf-plugins-core git gnome-desktop-testing dbus-daemon python3-twisted 
python3-gobject procps-ng bzip2 httpd mod_ssl openssh-server passwd gcc-c++ \
+ && dnf builddep --nogpg -y gvfs \
  && dnf clean all
 
-RUN dnf install -y --nogpg --best elfutils-libelf-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 \
+RUN dnf builddep --nogpg -y glib \
  && dnf clean all \
  && git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git \
  && cd glib \
@@ -13,7 +14,8 @@ RUN dnf install -y --nogpg --best elfutils-libelf-devel gcc gcc-c++ gdbm gettext
  && cd .. \
  && rm -rf glib
 
-RUN dnf install -y --nogpg libnghttp2-devel \
+RUN dnf builddep --nogpg -y libsoup \
+ && dnf install -y --nogpg libnghttp2-devel \
  && dnf clean all \
  && git clone --depth 1 https://gitlab.gnome.org/GNOME/libsoup.git \
  && cd libsoup \


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