[libsoup/carlosgc/client-side-certs2] docker: Update to Fedora 34
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/carlosgc/client-side-certs2] docker: Update to Fedora 34
- Date: Tue, 27 Apr 2021 23:46:53 +0000 (UTC)
commit e89348c4f50e7c19e40cb47f0805d620060c1fb6
Author: Patrick Griffis <pgriffis igalia com>
Date: Tue Apr 27 18:46:13 2021 -0500
docker: Update to Fedora 34
.gitlab-ci/Dockerfile | 18 +-----------------
.gitlab-ci/run-docker.sh | 2 +-
2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 702402e7..fe46a000 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:33
+FROM fedora:34
RUN dnf update -y \
&& dnf install -y 'dnf-command(builddep)' \
@@ -25,22 +25,6 @@ RUN dnf update -y \
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
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index d8c4a51e..55246968 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:v9"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v10"
SUDO_CMD="sudo"
if docker -v |& grep -q podman; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]