9:19 a.m.
All targets get pip3, which is now part of the base system, and
the number of native packages included in the MinGW containers is
significantly reduced.
The corresponding libvirt-ci commit is 4ff697ba0b5d.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed under the Dockerfile refresh rule.
ci/containers/libvirt-centos-8.Dockerfile | 1 +
.../libvirt-centos-stream.Dockerfile | 1 +
...libvirt-debian-10-cross-aarch64.Dockerfile | 1 +
.../libvirt-debian-10-cross-armv6l.Dockerfile | 1 +
.../libvirt-debian-10-cross-armv7l.Dockerfile | 1 +
.../libvirt-debian-10-cross-i686.Dockerfile | 1 +
.../libvirt-debian-10-cross-mips.Dockerfile | 1 +
...ibvirt-debian-10-cross-mips64el.Dockerfile | 1 +
.../libvirt-debian-10-cross-mipsel.Dockerfile | 1 +
...libvirt-debian-10-cross-ppc64le.Dockerfile | 1 +
.../libvirt-debian-10-cross-s390x.Dockerfile | 1 +
ci/containers/libvirt-debian-10.Dockerfile | 1 +
...ibvirt-debian-sid-cross-aarch64.Dockerfile | 1 +
...libvirt-debian-sid-cross-armv6l.Dockerfile | 1 +
...libvirt-debian-sid-cross-armv7l.Dockerfile | 1 +
.../libvirt-debian-sid-cross-i686.Dockerfile | 1 +
...bvirt-debian-sid-cross-mips64el.Dockerfile | 1 +
...libvirt-debian-sid-cross-mipsel.Dockerfile | 1 +
...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 1 +
.../libvirt-debian-sid-cross-s390x.Dockerfile | 1 +
ci/containers/libvirt-debian-sid.Dockerfile | 1 +
ci/containers/libvirt-fedora-31.Dockerfile | 1 +
ci/containers/libvirt-fedora-32.Dockerfile | 1 +
...rt-fedora-rawhide-cross-mingw32.Dockerfile | 42 +------------------
...rt-fedora-rawhide-cross-mingw64.Dockerfile | 42 +------------------
.../libvirt-fedora-rawhide.Dockerfile | 1 +
ci/containers/libvirt-ubuntu-2004.Dockerfile | 1 +
27 files changed, 29 insertions(+), 80 deletions(-)
diff --git a/ci/containers/libvirt-centos-8.Dockerfile
b/ci/containers/libvirt-centos-8.Dockerfile
index b6510834de..f376126d93 100644
--- a/ci/containers/libvirt-centos-8.Dockerfile
+++ b/ci/containers/libvirt-centos-8.Dockerfile
@@ -76,6 +76,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
diff --git a/ci/containers/libvirt-centos-stream.Dockerfile
b/ci/containers/libvirt-centos-stream.Dockerfile
index f65580b67d..bc75c95193 100644
--- a/ci/containers/libvirt-centos-stream.Dockerfile
+++ b/ci/containers/libvirt-centos-stream.Dockerfile
@@ -77,6 +77,7 @@ RUN dnf install -y centos-release-stream && \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
diff --git a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
index 3620bbdf7f..a03a7fd26a 100644
--- a/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-aarch64.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
index 5d390d0160..4f673cb3e2 100644
--- a/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv6l.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
index 2fdbe99bff..fa5fae4399 100644
--- a/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-armv7l.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
index 6517a4cb2e..a3bc96ac7a 100644
--- a/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-i686.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
index 48a45dbb7a..14844307c0 100644
--- a/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
index 1d997185e4..6f27e462b9 100644
--- a/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mips64el.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
index 332f2b13ed..4da9d1cb6e 100644
--- a/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-mipsel.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
index ec116175fc..841706bab8 100644
--- a/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-ppc64le.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
index b8cd02ae69..01a5bb5a77 100644
--- a/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-10-cross-s390x.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-10.Dockerfile
b/ci/containers/libvirt-debian-10.Dockerfile
index de795d386c..2b1c1b9855 100644
--- a/ci/containers/libvirt-debian-10.Dockerfile
+++ b/ci/containers/libvirt-debian-10.Dockerfile
@@ -81,6 +81,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
index a5d9a1d655..f573b8475a 100644
--- a/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-aarch64.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
index 9af186743f..2a9f81a15b 100644
--- a/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv6l.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
index 7e00d6c320..3e37184069 100644
--- a/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-armv7l.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
index d30468e8c6..e167a43b56 100644
--- a/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-i686.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
index 23399cb0f5..57ef04771e 100644
--- a/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mips64el.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
index c4f70dbace..a174fb57fd 100644
--- a/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-mipsel.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
index 6c093efea8..d1c412c452 100644
--- a/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-ppc64le.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
index e536587bc7..2dffc08895 100644
--- a/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/libvirt-debian-sid-cross-s390x.Dockerfile
@@ -45,6 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-debian-sid.Dockerfile
b/ci/containers/libvirt-debian-sid.Dockerfile
index 4e60303356..5b7b980419 100644
--- a/ci/containers/libvirt-debian-sid.Dockerfile
+++ b/ci/containers/libvirt-debian-sid.Dockerfile
@@ -81,6 +81,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
diff --git a/ci/containers/libvirt-fedora-31.Dockerfile
b/ci/containers/libvirt-fedora-31.Dockerfile
index 40288a2d03..06bd1435d3 100644
--- a/ci/containers/libvirt-fedora-31.Dockerfile
+++ b/ci/containers/libvirt-fedora-31.Dockerfile
@@ -74,6 +74,7 @@ RUN dnf update -y && \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
diff --git a/ci/containers/libvirt-fedora-32.Dockerfile
b/ci/containers/libvirt-fedora-32.Dockerfile
index ddb6378350..7b8a3fff44 100644
--- a/ci/containers/libvirt-fedora-32.Dockerfile
+++ b/ci/containers/libvirt-fedora-32.Dockerfile
@@ -74,6 +74,7 @@ RUN dnf update -y && \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
index cdf61fe845..ac5ecc2958 100644
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw32.Dockerfile
@@ -3,97 +3,59 @@ FROM fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
dnf update -y && \
dnf install -y \
- audit-libs-devel \
augeas \
autoconf \
automake \
- avahi-devel \
bash \
bash-completion \
ca-certificates \
ccache \
chrony \
cppi \
- cyrus-sasl-devel \
- dbus-devel \
- device-mapper-devel \
dnsmasq \
dwarves \
ebtables \
- fuse-devel \
gcc \
gdb \
- gettext \
gettext-devel \
git \
- glib2-devel \
- glibc-devel \
glibc-langpack-en \
- glusterfs-api-devel \
- gnutls-devel \
iproute \
iproute-tc \
iscsi-initiator-utils \
kmod \
- libacl-devel \
- libattr-devel \
- libblkid-devel \
- libcap-ng-devel \
- libcurl-devel \
- libiscsi-devel \
- libnl3-devel \
- libpcap-devel \
- libpciaccess-devel \
- librbd-devel \
- libselinux-devel \
- libssh-devel \
- libssh2-devel \
- libtirpc-devel \
libtool \
- libudev-devel \
libwsman-devel \
libxml2 \
- libxml2-devel \
libxslt \
lsof \
lvm2 \
make \
meson \
- ncurses-devel \
net-tools \
- netcf-devel \
nfs-utils \
ninja-build \
- numactl-devel \
numad \
parted \
- parted-devel \
patch \
perl \
- pkgconfig \
polkit \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
radvd \
- readline-devel \
rpcgen \
rpm-build \
- sanlock-devel \
screen \
scrub \
sheepdog \
strace \
sudo \
- systemtap-sdt-devel \
vim \
- wireshark-devel \
- xen-devel \
- xfsprogs-devel \
- yajl-devel \
zfs-fuse && \
dnf autoremove -y && \
dnf clean all -y && \
@@ -109,9 +71,9 @@ RUN dnf install -y \
mingw32-gettext \
mingw32-glib2 \
mingw32-gnutls \
+ mingw32-headers \
mingw32-libssh2 \
mingw32-libxml2 \
- mingw32-openssl \
mingw32-pkg-config \
mingw32-portablexdr \
mingw32-readline && \
diff --git a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
index 2b7f9eeac1..e52e2fed04 100644
--- a/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide-cross-mingw64.Dockerfile
@@ -3,97 +3,59 @@ FROM fedora:rawhide
RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
dnf update -y && \
dnf install -y \
- audit-libs-devel \
augeas \
autoconf \
automake \
- avahi-devel \
bash \
bash-completion \
ca-certificates \
ccache \
chrony \
cppi \
- cyrus-sasl-devel \
- dbus-devel \
- device-mapper-devel \
dnsmasq \
dwarves \
ebtables \
- fuse-devel \
gcc \
gdb \
- gettext \
gettext-devel \
git \
- glib2-devel \
- glibc-devel \
glibc-langpack-en \
- glusterfs-api-devel \
- gnutls-devel \
iproute \
iproute-tc \
iscsi-initiator-utils \
kmod \
- libacl-devel \
- libattr-devel \
- libblkid-devel \
- libcap-ng-devel \
- libcurl-devel \
- libiscsi-devel \
- libnl3-devel \
- libpcap-devel \
- libpciaccess-devel \
- librbd-devel \
- libselinux-devel \
- libssh-devel \
- libssh2-devel \
- libtirpc-devel \
libtool \
- libudev-devel \
libwsman-devel \
libxml2 \
- libxml2-devel \
libxslt \
lsof \
lvm2 \
make \
meson \
- ncurses-devel \
net-tools \
- netcf-devel \
nfs-utils \
ninja-build \
- numactl-devel \
numad \
parted \
- parted-devel \
patch \
perl \
- pkgconfig \
polkit \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
radvd \
- readline-devel \
rpcgen \
rpm-build \
- sanlock-devel \
screen \
scrub \
sheepdog \
strace \
sudo \
- systemtap-sdt-devel \
vim \
- wireshark-devel \
- xen-devel \
- xfsprogs-devel \
- yajl-devel \
zfs-fuse && \
dnf autoremove -y && \
dnf clean all -y && \
@@ -109,9 +71,9 @@ RUN dnf install -y \
mingw64-gettext \
mingw64-glib2 \
mingw64-gnutls \
+ mingw64-headers \
mingw64-libssh2 \
mingw64-libxml2 \
- mingw64-openssl \
mingw64-pkg-config \
mingw64-portablexdr \
mingw64-readline && \
diff --git a/ci/containers/libvirt-fedora-rawhide.Dockerfile
b/ci/containers/libvirt-fedora-rawhide.Dockerfile
index 28400a4e53..d3c97ddda0 100644
--- a/ci/containers/libvirt-fedora-rawhide.Dockerfile
+++ b/ci/containers/libvirt-fedora-rawhide.Dockerfile
@@ -75,6 +75,7 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
python3 \
python3-docutils \
python3-flake8 \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-img \
diff --git a/ci/containers/libvirt-ubuntu-2004.Dockerfile
b/ci/containers/libvirt-ubuntu-2004.Dockerfile
index 98178b1591..855b673f87 100644
--- a/ci/containers/libvirt-ubuntu-2004.Dockerfile
+++ b/ci/containers/libvirt-ubuntu-2004.Dockerfile
@@ -82,6 +82,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
policykit-1 \
python3 \
python3-docutils \
+ python3-pip \
python3-setuptools \
python3-wheel \
qemu-utils \
--
2.25.4
9:25 a.m.
On Thu, Jun 25, 2020 at 04:19:16PM +0200, Andrea Bolognani wrote:
All targets get pip3, which is now part of the base system, and
the number of native packages included in the MinGW containers is
significantly reduced.
FWIW, I thinkit would be benefit to reduce and even eliminate
the base set in the futre. It didn't have any downsides in
CentOS CI, since we had VMs with all projects installed.
With containers though, it feels silly to install a pile of
python stuff in containers for golang projects. Or install
autotools in meson projects and vica-verca.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
9:32 a.m.
On Thu, 2020-06-25 at 15:25 +0100, Daniel P. Berrangé wrote:
On Thu, Jun 25, 2020 at 04:19:16PM +0200, Andrea Bolognani wrote:
> All targets get pip3, which is now part of the base system, and
> the number of native packages included in the MinGW containers is
> significantly reduced.
FWIW, I thinkit would be benefit to reduce and even eliminate
the base set in the futre. It didn't have any downsides in
CentOS CI, since we had VMs with all projects installed.
With containers though, it feels silly to install a pile of
python stuff in containers for golang projects. Or install
autotools in meson projects and vica-verca.
Yeah, we can certainly do better. In due time :)
--
Andrea Bolognani / Red Hat / Virtualization
1612
days inactive
1612
days old
2 comments
2 participants
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé