[libvirt PATCH 3/8] ci: Refresh contents

Notable changes: * the CentOS Stream 8 container is now using a proper base image instead of starting from a CentOS 8 image and then adding the CentOS Stream 8 repositories on top; * distributions that have a perl-base package are now using that one instead of the regular perl package, which contains a bunch of features we don't need, resulting in smaller containers. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/centos-8.Dockerfile | 2 +- ci/containers/centos-stream-8.Dockerfile | 10 ++++------ ci/containers/debian-10-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-10-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-10-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-10-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-10-cross-mips.Dockerfile | 4 ++-- ci/containers/debian-10-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-10-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-10-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-10-cross-s390x.Dockerfile | 4 ++-- ci/containers/debian-10.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-aarch64.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-armv6l.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-armv7l.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-i686.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-mips64el.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-mipsel.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 4 ++-- ci/containers/debian-sid-cross-s390x.Dockerfile | 4 ++-- ci/containers/debian-sid.Dockerfile | 4 ++-- ci/containers/fedora-33.Dockerfile | 4 ++-- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 4 ++-- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 4 ++-- ci/containers/fedora-rawhide.Dockerfile | 4 ++-- ci/containers/opensuse-leap-152.Dockerfile | 6 +++--- ci/containers/ubuntu-1804.Dockerfile | 4 ++-- ci/containers/ubuntu-2004.Dockerfile | 4 ++-- 31 files changed, 61 insertions(+), 63 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 7bd875176e..40a19b5773 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-12 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 0f5b704a7b..e4de22b302 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-current libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 8965338456..a723cdf927 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,7 +2,7 @@ # # $ lcitool variables macos-11 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... PACKAGING_COMMAND='brew' CCACHE='/usr/local/bin/ccache' diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index 0c7292b8d2..9358e69b0c 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/centos:8 diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 3bc66775eb..3355374e67 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -1,14 +1,12 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-stream libvirt +# $ lcitool dockerfile centos-stream-8 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... -FROM docker.io/library/centos:8 +FROM quay.io/centos/centos:stream8 -RUN dnf install -y centos-release-stream && \ - dnf install -y centos-stream-release && \ - dnf update -y && \ +RUN dnf update -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index e006dcc68b..7d10b93d06 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index abc3ef52db..25057ea993 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 2e9bedf614..ef880ac0fe 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 4b88d751bd..5826866c2d 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index dbdc9c57a8..aaa2df47a8 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index 37044e296d..d3f25791a3 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 3587f52374..cc9142aa72 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index e8699d896b..ce68bbb19f 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index b31b5fd051..773f04933f 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -38,7 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index d4ab8196c2..119a77bb09 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:10-slim @@ -75,7 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 514f42a83e..736414b179 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross aarch64 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 592c485f64..b4304a7f32 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv6l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index f4e9829961..e4db402bc9 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross armv7l debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 500e306f8b..983cd2a336 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross i686 debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 1ed444d9d3..e568b46d60 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mips64el debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index e30e1cf808..cf24c09244 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mipsel debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 430cd1176c..40be4130af 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross ppc64le debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 716002dbaa..e0b7dff94a 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross s390x debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -39,7 +39,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 011b766715..454d726465 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/debian:sid-slim @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 2885eafbb0..aed94d1256 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM registry.fedoraproject.org/fedora:33 @@ -79,7 +79,7 @@ exec "$@"' > /usr/bin/nosync && \ numad \ parted \ parted-devel \ - perl \ + perl-base \ pkgconfig \ polkit \ python3 \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 139e0b145c..93a57b3277 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM registry.fedoraproject.org/fedora:rawhide @@ -47,7 +47,7 @@ exec "$@"' > /usr/bin/nosync && \ ninja-build \ numad \ parted \ - perl \ + perl-base \ polkit \ python3 \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index b24049f879..ed16d75479 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM registry.fedoraproject.org/fedora:rawhide @@ -47,7 +47,7 @@ exec "$@"' > /usr/bin/nosync && \ ninja-build \ numad \ parted \ - perl \ + perl-base \ polkit \ python3 \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 1f0abb7288..79bacbcc95 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM registry.fedoraproject.org/fedora:rawhide @@ -80,7 +80,7 @@ exec "$@"' > /usr/bin/nosync && \ numad \ parted \ parted-devel \ - perl \ + perl-base \ pkgconfig \ polkit \ python3 \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index 6b56641292..b5f7e5f54e 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -1,8 +1,8 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-152 libvirt +# $ lcitool dockerfile opensuse-leap-152 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM registry.opensuse.org/opensuse/leap:15.2 @@ -68,7 +68,7 @@ RUN zypper update -y && \ open-iscsi \ parted \ parted-devel \ - perl \ + perl-base \ pkgconfig \ polkit \ python3-base \ diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index c6c3ef5823..5e4a2e0b8f 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/ubuntu:18.04 @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index 78df341dca..0e2790f03f 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libvirt # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/6552fd8885423cfc383a58255e... +# https://gitlab.com/libvirt/libvirt-ci/-/commit/1d4e10a04c6a0d29302003244a... FROM docker.io/library/ubuntu:20.04 @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ numad \ open-iscsi \ parted \ - perl \ + perl-base \ pkgconf \ policykit-1 \ python3 \ -- 2.26.3