From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH 10/23] tests/docker: fix mistakes in ubuntu package lists
Date: Tue, 1 Dec 2020 17:18:12 +0000 [thread overview]
Message-ID: <20201201171825.2243775-11-berrange@redhat.com> (raw)
In-Reply-To: <20201201171825.2243775-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.
vim-nox is preferred over vim as it is smaller and graphics aren't
needed in containers.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/docker/dockerfiles/ubuntu1804.docker | 3 ---
tests/docker/dockerfiles/ubuntu2004.docker | 11 +++--------
2 files changed, 3 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 2bb7e2ab1e..84c617354c 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,14 +1,11 @@
FROM docker.io/library/ubuntu:20.04
ENV PACKAGES \
- bison \
ccache \
- clang-10\
- flex \
+ clang \
gcc \
genisoimage \
gettext \
git \
- glusterfs-common \
libaio-dev \
libattr1-dev \
libbrlapi-dev \
@@ -27,12 +24,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 \
@@ -49,7 +44,7 @@ ENV PACKAGES \
libxen-dev \
libzstd-dev \
make \
- netcat-openbsd \
+ ncat \
ninja-build \
python3-numpy \
python3-opencv \
@@ -62,7 +57,7 @@ ENV PACKAGES \
sparse \
tesseract-ocr \
tesseract-ocr-eng \
- vim \
+ vim-nox \
xfslibs-dev
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
--
2.28.0
next prev parent reply other threads:[~2020-12-01 17:26 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 17:18 [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 01/23] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 02/23] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 03/23] tests/docker: use project specific container registries Daniel P. Berrangé
2020-12-02 11:54 ` Gerd Hoffmann
2020-12-02 12:03 ` Daniel P. Berrangé
2021-01-13 21:17 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 04/23] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2020-12-01 17:34 ` Philippe Mathieu-Daudé
2021-01-13 21:22 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 05/23] tests/docker: remove travis container Daniel P. Berrangé
2020-12-02 12:08 ` Thomas Huth
2021-01-13 21:26 ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 06/23] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 07/23] tests/docker: fix sorting in package lists Daniel P. Berrangé
2020-12-01 17:35 ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` [PATCH 08/23] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 09/23] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2020-12-01 17:36 ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` Daniel P. Berrangé [this message]
2020-12-01 17:18 ` [PATCH 11/23] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 12/23] tests/docker: add script for automating container refresh Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 13/23] tests/docker: expand centos7 package list Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 14/23] tests/docker: expand centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 15/23] tests/docker: expand fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 16/23] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 17/23] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 18/23] tests/docker: auto-generate centos7 with lcitool Daniel P. Berrangé
2020-12-02 12:07 ` Gerd Hoffmann
2020-12-04 13:37 ` Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 19/23] tests/docker: auto-generate centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 20/23] tests/docker: auto-generate fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 21/23] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 22/23] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 23/23] tests/docker: remove ubuntu container Daniel P. Berrangé
2020-12-01 17:53 ` [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Kashyap Chamarthy
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=20201201171825.2243775-11-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).