On 1/14/21 10:02 AM, Daniel P. Berrangé wrote:
> 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.
Maybe just remove vim as it isn't required for build/tests?
Anyway,
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 | 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