[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists
From: |
Alex Bennée |
Subject: |
[PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists |
Date: |
Tue, 6 Jul 2021 15:57:55 +0100 |
From: Daniel P. Berrangé <berrange@redhat.com>
librados-dev is not required by QEMU directly, only librbd-dev.
glusterfs-common is not directly needed by QEMU.
QEMU uses ncursesw only on non-Windows hosts.
The clang package is clang 10.
flex and bison are not required by QEMU.
Standardize on nmap ncat implementation to match Fedora/CentOS.
Remove vim since it is not a build pre-requisite and no other containers
include it.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623142245.307776-10-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/ubuntu1804.docker | 3 ---
tests/docker/dockerfiles/ubuntu2004.docker | 10 ++--------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker
b/tests/docker/dockerfiles/ubuntu1804.docker
index a50a35e6fe..ee8545e4b1 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -5,7 +5,6 @@ ENV PACKAGES \
gcc \
gettext \
git \
- glusterfs-common \
libaio-dev \
libattr1-dev \
libbrlapi-dev \
@@ -24,12 +23,10 @@ ENV PACKAGES \
libjemalloc-dev \
libjpeg-turbo8-dev \
liblzo2-dev \
- libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
libnuma-dev \
libpixman-1-dev \
- librados-dev \
librbd-dev \
librdmacm-dev \
libsasl2-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker
b/tests/docker/dockerfiles/ubuntu2004.docker
index eee2ef3cac..25f56adfb2 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,16 +1,13 @@
FROM docker.io/library/ubuntu:20.04
ENV PACKAGES \
- bison \
bsdmainutils \
ccache \
- clang-10\
- flex \
+ clang \
gcc \
gcovr \
genisoimage \
gettext \
git \
- glusterfs-common \
libaio-dev \
libattr1-dev \
libbrlapi-dev \
@@ -30,12 +27,10 @@ ENV PACKAGES \
libjpeg-turbo8-dev \
liblttng-ust-dev \
liblzo2-dev \
- libncurses5-dev \
libncursesw5-dev \
libnfs-dev \
libnuma-dev \
libpixman-1-dev \
- librados-dev \
librbd-dev \
librdmacm-dev \
libsasl2-dev \
@@ -53,7 +48,7 @@ ENV PACKAGES \
libxen-dev \
libzstd-dev \
make \
- netcat-openbsd \
+ ncat \
ninja-build \
python3-numpy \
python3-opencv \
@@ -67,7 +62,6 @@ ENV PACKAGES \
sparse \
tesseract-ocr \
tesseract-ocr-eng \
- vim \
xfslibs-dev
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
--
2.20.1
- [PATCH v1 30/39] configure: stop user enabling plugins on Windows for now, (continued)
- [PATCH v1 30/39] configure: stop user enabling plugins on Windows for now, Alex Bennée, 2021/07/06
- [PATCH v1 22/39] tests/docker: expand ubuntu2004 package list, Alex Bennée, 2021/07/06
- [PATCH v1 36/39] plugins/cache: Enable cache parameterization, Alex Bennée, 2021/07/06
- [PATCH v1 16/39] tests/docker: fix mistakes in fedora package list, Alex Bennée, 2021/07/06
- [PATCH v1 19/39] tests/docker: expand centos8 package list, Alex Bennée, 2021/07/06
- [PATCH v1 39/39] MAINTAINTERS: Added myself as a reviewer for TCG Plugins, Alex Bennée, 2021/07/06
- [PATCH v1 14/39] tests/docker: fix sorting in package lists, Alex Bennée, 2021/07/06
- [PATCH v1 27/39] plugins: fix-up handling of internal hostaddr for 32 bit, Alex Bennée, 2021/07/06
- [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists,
Alex Bennée <=
- [PATCH v1 31/39] tcg/plugins: enable by default for TCG builds, Alex Bennée, 2021/07/06
- [PATCH v1 25/39] tests/vm: update openbsd to release 6.9, Alex Bennée, 2021/07/06
- [PATCH v1 38/39] docs/devel: Added cache plugin to the plugins docs, Alex Bennée, 2021/07/06
- [PATCH v1 24/39] tests/vm: update NetBSD to 9.2, Alex Bennée, 2021/07/06
- [PATCH v1 18/39] tests/docker: remove mingw packages from Fedora, Alex Bennée, 2021/07/06
- [PATCH v1 35/39] plugins: Added a new cache modelling plugin, Alex Bennée, 2021/07/06
- [PATCH v1 29/39] configure: don't allow plugins to be enabled for a non-TCG build, Alex Bennée, 2021/07/06