[glib: 2/10] ci: Update Fedora CI images to new oldstable (33)
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 2/10] ci: Update Fedora CI images to new oldstable (33)
- Date: Mon, 18 Oct 2021 10:48:32 +0000 (UTC)
commit 1bba03672e48107c6e8af2ffbc610c2cb241e084
Author: Philip Withnall <pwithnall endlessos org>
Date: Thu Oct 7 16:29:31 2021 +0100
ci: Update Fedora CI images to new oldstable (33)
Signed-off-by: Philip Withnall <pwithnall endlessos org>
.gitlab-ci/android-ndk.Dockerfile | 2 +-
.gitlab-ci/fedora.Dockerfile | 8 ++++----
.gitlab-ci/mingw.Dockerfile | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci/android-ndk.Dockerfile b/.gitlab-ci/android-ndk.Dockerfile
index 90b95826d..8bcedfe62 100644
--- a/.gitlab-ci/android-ndk.Dockerfile
+++ b/.gitlab-ci/android-ndk.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:33
RUN dnf -y install \
autoconf \
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 139d87fb8..07569aea0 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,7 +1,4 @@
-FROM fedora:31
-
-# Set /etc/machine-id as it’s needed for some D-Bus tests
-RUN systemd-machine-id-setup
+FROM fedora:33
RUN dnf -y update \
&& dnf -y install \
@@ -79,6 +76,9 @@ RUN dnf -y update \
RUN pip3 install meson==0.52.1
+# Set /etc/machine-id as it’s needed for some D-Bus tests
+RUN systemd-machine-id-setup
+
# Enable sudo for wheel users
RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
diff --git a/.gitlab-ci/mingw.Dockerfile b/.gitlab-ci/mingw.Dockerfile
index 2928b562c..6691c8618 100644
--- a/.gitlab-ci/mingw.Dockerfile
+++ b/.gitlab-ci/mingw.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:33
RUN dnf -y install \
bindfs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]