[gvfs/wip/oholy/ci-libsoup3: 2/3] Revert "ci: Add libgdata master to Dockerfile"
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs/wip/oholy/ci-libsoup3: 2/3] Revert "ci: Add libgdata master to Dockerfile"
- Date: Fri, 15 Oct 2021 07:16:59 +0000 (UTC)
commit 9509a83b982253e33cc9aa515d300eabb26b3ccc
Author: Ondrej Holy <oholy redhat com>
Date: Fri Oct 15 09:13:02 2021 +0200
Revert "ci: Add libgdata master to Dockerfile"
This reverts commit 0114b4ebb0e00390a788338fa3fe6b8b8c1036b5.
.gitlab-ci/Dockerfile | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 91de9c6f..93262e2b 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,6 +1,6 @@
FROM fedora:rawhide
-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
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 -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 \
&& 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 \
@@ -13,16 +13,6 @@ RUN dnf install -y --nogpg --best elfutils-libelf-devel gcc gcc-c++ gdbm gettext
&& cd .. \
&& rm -rf glib
-RUN dnf install -y --nogpg uhttpmock-devel gobject-introspection-devel liboauth-devel vala json-glib-devel \
- && dnf clean all \
- && git clone --depth 1 https://gitlab.gnome.org/GNOME/libgdata.git \
- && cd libgdata \
- && meson . _build --prefix=/usr \
- && ninja -C _build \
- && ninja -C _build install \
- && cd .. \
- && rm -rf libgdata
-
RUN sed -i -e 's/# %wheel/%wheel/' /etc/sudoers
RUN useradd -G wheel -m user
RUN passwd -d user
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]