[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/23] tests/docker: fix mistakes in centos package lists
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 08/23] tests/docker: fix mistakes in centos package lists |
Date: |
Tue, 1 Dec 2020 17:18:10 +0000 |
dbus-daemon doesn't exist in centos7, it is part of dbus.
snappy is used by QEMU, not csnappy.
mesa-libEGL-devel is not used in QEMU at all, but mesa-libgbm-devel is.
vte291-devel is required for GTK3, not vte-devel.
spice-glib-devel is not use in QEMU at all, but spice-protocol is.
librdmacm-devel is a virtual provides for compat, the actual package
used is rdma-core-devel.
There is no need to specifically refer to python36, we can just
use python3 as in other distros.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/centos7.docker | 11 +++++------
tests/docker/dockerfiles/centos8.docker | 10 +++++-----
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/tests/docker/dockerfiles/centos7.docker
b/tests/docker/dockerfiles/centos7.docker
index 4372e200d7..f3ef2cf8d8 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -9,8 +9,7 @@ ENV PACKAGES \
bzip2 \
bzip2-devel \
ccache \
- csnappy-devel \
- dbus-daemon \
+ dbus \
gcc \
gcc-c++ \
gettext \
@@ -22,21 +21,21 @@ ENV PACKAGES \
libepoxy-devel \
libfdt-devel \
libgcrypt-devel \
- librdmacm-devel \
libzstd-devel \
lzo-devel \
make \
- mesa-libEGL-devel \
mesa-libgbm-devel \
nettle-devel \
ninja-build \
perl-Test-Harness \
pixman-devel \
python3 \
- spice-glib-devel \
+ rdma-core-devel \
+ snappy-devel \
+ spice-protocol \
spice-server-devel \
tar \
- vte-devel \
+ vte291-devel \
xen-devel \
zlib-devel
RUN yum install -y $PACKAGES
diff --git a/tests/docker/dockerfiles/centos8.docker
b/tests/docker/dockerfiles/centos8.docker
index 9560bb06e2..1d10b8c263 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -18,16 +18,16 @@ ENV PACKAGES \
libgcrypt-devel \
lzo-devel \
make \
- mesa-libEGL-devel \
- nmap-ncat \
+ mesa-libgbm-devel \
nettle-devel \
ninja-build \
+ nmap-ncat \
perl-Test-Harness \
pixman-devel \
- python36 \
+ python3 \
rdma-core-devel \
- spice-glib-devel \
- spice-server \
+ spice-protocol \
+ spice-server-devel \
tar \
zlib-devel
--
2.28.0
- [PATCH 03/23] tests/docker: use project specific container registries, (continued)
- [PATCH 03/23] tests/docker: use project specific container registries, Daniel P . Berrangé, 2020/12/01
- [PATCH 05/23] tests/docker: remove travis container, Daniel P . Berrangé, 2020/12/01
- [PATCH 04/23] tests/docker: use explicit docker.io registry, Daniel P . Berrangé, 2020/12/01
- [PATCH 06/23] tests/docker: remove FEATURES env var from templates, Daniel P . Berrangé, 2020/12/01
- [PATCH 07/23] tests/docker: fix sorting in package lists, Daniel P . Berrangé, 2020/12/01
- [PATCH 08/23] tests/docker: fix mistakes in centos package lists,
Daniel P . Berrangé <=
- [PATCH 09/23] tests/docker: fix mistakes in fedora package list, Daniel P . Berrangé, 2020/12/01
- [PATCH 10/23] tests/docker: fix mistakes in ubuntu package lists, Daniel P . Berrangé, 2020/12/01
- [PATCH 13/23] tests/docker: expand centos7 package list, Daniel P . Berrangé, 2020/12/01
- [PATCH 11/23] tests/docker: remove mingw packages from Fedora, Daniel P . Berrangé, 2020/12/01
- [PATCH 14/23] tests/docker: expand centos8 package list, Daniel P . Berrangé, 2020/12/01
- [PATCH 15/23] tests/docker: expand fedora package list, Daniel P . Berrangé, 2020/12/01
- [PATCH 17/23] tests/docker: expand ubuntu2004 package list, Daniel P . Berrangé, 2020/12/01
- [PATCH 12/23] tests/docker: add script for automating container refresh, Daniel P . Berrangé, 2020/12/01
- [PATCH 16/23] tests/docker: expand ubuntu1804 package list, Daniel P . Berrangé, 2020/12/01