[libsoup] docker: Upgrade to Fedora 34
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] docker: Upgrade to Fedora 34
- Date: Tue, 18 May 2021 17:31:01 +0000 (UTC)
commit 65017c734e226d4bc84ca6193b1ab8d9a3c32a65
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue May 18 10:26:25 2021 -0500
docker: Upgrade to Fedora 34
.gitlab-ci/Dockerfile | 35 +++++++++++------------------------
1 file changed, 11 insertions(+), 24 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index b84d0690..1897ab16 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,16 +1,16 @@
-FROM fedora:33
+FROM fedora-minimal:34
-RUN dnf update -y \
- && dnf install -y 'dnf-command(builddep)' \
- && dnf builddep -y libsoup glib2 gobject-introspection vala \
- && dnf install -y autoconf-archive \
+RUN microdnf update -y \
+ && microdnf install -y autoconf-archive \
brotli-devel \
clang-analyzer \
git \
glib2-doc \
gnutls-devel \
+ gobject-introspection-devel \
gtk-doc \
httpd \
+ krb5-devel \
lcov \
libasan \
libpsl-devel \
@@ -19,32 +19,19 @@ RUN dnf update -y \
make \
meson \
mod_ssl \
- python2.7.x86_64 \
+ python2.7 \
redhat-rpm-config \
samba-winbind-clients \
+ sqlite-devel \
sysprof-devel \
valgrind \
which \
- && dnf clean all \
- && git clone https://gitlab.gnome.org/GNOME/glib.git \
- && pushd glib \
- && meson _build --prefix=/usr -Dgtk_doc=true \
- && meson install -C _build \
- && popd \
- && git clone https://gitlab.gnome.org/GNOME/gobject-introspection.git \
- && pushd gobject-introspection \
- && meson _build --prefix=/usr \
- && meson install -C _build \
- && popd \
- && git clone https://gitlab.gnome.org/GNOME/vala.git \
- && pushd vala \
- && ./autogen.sh --prefix=/usr \
- && make install \
- && popd \
- && rm -rf glib gobject-introspection vala \
&& python2.7 -m ensurepip \
&& pip2.7 install virtualenv autobahntestsuite \
- && pip3 install quart
+ && pip3 install quart \
+ && microdnf install -y fedora-repos-rawhide \
+ && microdnf install --enablerepo=rawhide -y vala \
+ && microdnf clean all
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]