From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: "Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PATCH 5/5] tests/docker/dockerfiles: Run lcitool-refresh to update Fedora and Alpine
Date: Sat, 1 Jun 2024 09:05:43 +0200 [thread overview]
Message-ID: <20240601070543.37786-6-thuth@redhat.com> (raw)
In-Reply-To: <20240601070543.37786-1-thuth@redhat.com>
Run "make lcitool-refresh" to update the dockerfiles with the recent
changes to the lcitool.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/docker/dockerfiles/alpine.docker | 4 ++--
tests/docker/dockerfiles/fedora-win64-cross.docker | 6 ++++--
tests/docker/dockerfiles/fedora.docker | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 554464f31e..b079a83fe2 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all alpine-318 qemu
+# $ lcitool dockerfile --layers all alpine-319 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/alpine:3.18
+FROM docker.io/library/alpine:3.19
RUN apk update && \
apk upgrade && \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 0f78711876..007e1574bd 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer
+# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-40 qemu,qemu-win-installer
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
RUN dnf install -y nosync && \
printf '#!/bin/sh\n\
@@ -51,6 +51,7 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-pip \
python3-sphinx \
python3-sphinx_rtd_theme \
+ python3-zombie-imp \
sed \
socat \
sparse \
@@ -74,6 +75,7 @@ ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3"
RUN nosync dnf install -y \
+ mingw-w64-tools \
mingw32-nsis \
mingw64-SDL2 \
mingw64-SDL2_image \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 098c894d10..44f239c088 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all fedora-38 qemu
+# $ lcitool dockerfile --layers all fedora-40 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM registry.fedoraproject.org/fedora:38
+FROM registry.fedoraproject.org/fedora:40
RUN dnf install -y nosync && \
printf '#!/bin/sh\n\
@@ -110,6 +110,7 @@ exec "$@"\n' > /usr/bin/nosync && \
python3-pip \
python3-sphinx \
python3-sphinx_rtd_theme \
+ python3-zombie-imp \
rdma-core-devel \
sed \
snappy-devel \
--
2.45.1
next prev parent reply other threads:[~2024-06-01 7:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-01 7:05 [PATCH 0/5] tests: Update Fedora and Alpine containers via lcitool Thomas Huth
2024-06-01 7:05 ` [PATCH 1/5] tests/lcitool: Delete obsolete centos-stream-8.yml file Thomas Huth
2024-06-03 9:32 ` Daniel P. Berrangé
2024-06-01 7:05 ` [PATCH 2/5] tests/lcitool: Bump to latest libvirt-ci and update Fedora and Alpine version Thomas Huth
2024-06-03 9:32 ` Daniel P. Berrangé
2024-06-01 7:05 ` [PATCH 3/5] .gitlab-ci.d/buildtest.yml: Use -fno-sanitize=function in the clang-system job Thomas Huth
2024-06-03 9:34 ` Daniel P. Berrangé
2024-06-01 7:05 ` [PATCH 4/5] tests/lcitool: Install mingw-w64-tools for the Windows cross-builds Thomas Huth
2024-06-03 9:34 ` Daniel P. Berrangé
2024-06-03 11:20 ` Philippe Mathieu-Daudé
2024-06-01 7:05 ` Thomas Huth [this message]
2024-06-03 9:35 ` [PATCH 5/5] tests/docker/dockerfiles: Run lcitool-refresh to update Fedora and Alpine Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240601070543.37786-6-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).