From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v3 09/22] tests/docker: fix mistakes in ubuntu package lists
Date: Thu, 13 May 2021 10:55:06 +0100 [thread overview]
Message-ID: <20210513095519.1213675-10-berrange@redhat.com> (raw)
In-Reply-To: <20210513095519.1213675-1-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.
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
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 58a373e205..f063cfe921 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 \
@@ -23,12 +22,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 5044f4d9b7..d655d020fb 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 \
@@ -29,12 +26,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 \
@@ -52,7 +47,7 @@ ENV PACKAGES \
libxen-dev \
libzstd-dev \
make \
- netcat-openbsd \
+ ncat \
ninja-build \
python3-numpy \
python3-opencv \
@@ -65,7 +60,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.31.1
next prev parent reply other threads:[~2021-05-13 10:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 9:54 [PATCH v3 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-05-13 9:54 ` [PATCH v3 01/22] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2021-05-13 9:54 ` [PATCH v3 02/22] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 03/22] tests/docker: use project specific container registries Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 04/22] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 05/22] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 06/22] tests/docker: fix sorting in package lists Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 07/22] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2021-05-13 10:14 ` Philippe Mathieu-Daudé
2021-05-13 9:55 ` [PATCH v3 08/22] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2021-05-13 9:55 ` Daniel P. Berrangé [this message]
2021-05-13 10:12 ` [PATCH v3 09/22] tests/docker: fix mistakes in ubuntu package lists Philippe Mathieu-Daudé
2021-05-13 10:15 ` Daniel P. Berrangé
2021-05-13 10:19 ` Philippe Mathieu-Daudé
2021-05-13 9:55 ` [PATCH v3 10/22] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 11/22] tests/docker: expand centos8 package list Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 12/22] tests/docker: expand fedora " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 13/22] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 14/22] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 15/22] tests/docker: expand opensuse-leap " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 16/22] tests/docker: add script for automating container refresh Daniel P. Berrangé
2021-05-13 10:18 ` Philippe Mathieu-Daudé
2021-05-13 9:55 ` [PATCH v3 17/22] tests/docker: auto-generate centos8 with lcitool Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 18/22] tests/docker: auto-generate fedora " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 19/22] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 20/22] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 21/22] tests/docker: auto-generate opensuse-leap " Daniel P. Berrangé
2021-05-13 9:55 ` [PATCH v3 22/22] tests/docker: remove ubuntu container Daniel P. Berrangé
2021-05-13 10:39 ` [PATCH v3 00/22] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles no-reply
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=20210513095519.1213675-10-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/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).