[libsoup/wip/fedora-minimal] ci: Switch to fedora-minimal:34
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/fedora-minimal] ci: Switch to fedora-minimal:34
- Date: Wed, 12 May 2021 01:04:36 +0000 (UTC)
commit f55353106b431fc5a6015e4a809099a77d3b29c0
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue May 11 20:04:26 2021 -0500
ci: Switch to fedora-minimal:34
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 26 ++++----------------------
.gitlab-ci/run-docker.sh | 2 +-
3 files changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5d6cf13..d49896b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v10
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v12
stages:
- build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 702402e7..0abf1e6f 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,9 +1,7 @@
-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 \
@@ -24,23 +22,7 @@ RUN dnf update -y \
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 \
+ && microdnf clean all \
&& python2.7 -m ensurepip \
&& pip2.7 install virtualenv autobahntestsuite
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 55246968..fce3d40d 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v10"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v12"
SUDO_CMD="sudo"
if docker -v |& grep -q podman; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]