SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/docker: fix mistakes in ubuntu package lists

Browse Source 
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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
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>
Message-Id: <20210709143005.1554-18-alex.bennee@linaro.org>
This commit is contained in:
Daniel P. Berrangé 2021-07-09 15:29:42 +01:00 committed by Alex Bennée
parent e053de7e63
commit dfaaacc67f
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/docker/dockerfiles/ubuntu1804.docker
View File

@ -5,7 +5,6 @@ ENV PACKAGES \
gcc \ gcc \
gettext \ gettext \
git \ git \
glusterfs-common \
libaio-dev \ libaio-dev \
libattr1-dev \ libattr1-dev \
libbrlapi-dev \ libbrlapi-dev \
@ -24,12 +23,10 @@ ENV PACKAGES \
libjemalloc-dev \ libjemalloc-dev \
libjpeg-turbo8-dev \ libjpeg-turbo8-dev \
liblzo2-dev \ liblzo2-dev \
libncurses5-dev \
libncursesw5-dev \ libncursesw5-dev \
libnfs-dev \ libnfs-dev \
libnuma-dev \ libnuma-dev \
libpixman-1-dev \ libpixman-1-dev \
librados-dev \
librbd-dev \ librbd-dev \
librdmacm-dev \ librdmacm-dev \
libsasl2-dev \ libsasl2-dev \

10
tests/docker/dockerfiles/ubuntu2004.docker
View File

@ -1,16 +1,13 @@
FROM docker.io/library/ubuntu:20.04 FROM docker.io/library/ubuntu:20.04
ENV PACKAGES \ ENV PACKAGES \
bison \
bsdmainutils \ bsdmainutils \
ccache \ ccache \
clang-10\ clang \
flex \
gcc \ gcc \
gcovr \ gcovr \
genisoimage \ genisoimage \
gettext \ gettext \
git \ git \
glusterfs-common \
libaio-dev \ libaio-dev \
libattr1-dev \ libattr1-dev \
libbrlapi-dev \ libbrlapi-dev \
@ -30,12 +27,10 @@ ENV PACKAGES \
libjpeg-turbo8-dev \ libjpeg-turbo8-dev \
liblttng-ust-dev \ liblttng-ust-dev \
liblzo2-dev \ liblzo2-dev \
libncurses5-dev \
libncursesw5-dev \ libncursesw5-dev \
libnfs-dev \ libnfs-dev \
libnuma-dev \ libnuma-dev \
libpixman-1-dev \ libpixman-1-dev \
librados-dev \
librbd-dev \ librbd-dev \
librdmacm-dev \ librdmacm-dev \
libsasl2-dev \ libsasl2-dev \
@ -53,7 +48,7 @@ ENV PACKAGES \
libxen-dev \ libxen-dev \
libzstd-dev \ libzstd-dev \
make \ make \
netcat-openbsd \ ncat \
ninja-build \ ninja-build \
python3-numpy \ python3-numpy \
python3-opencv \ python3-opencv \
@ -67,7 +62,6 @@ ENV PACKAGES \
sparse \ sparse \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
vim \
xfslibs-dev xfslibs-dev
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES