| Message ID | 20210513095519.1213675-10-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/docker: start using libvirt-ci's "lcitool" for dockerfiles | expand |
On 5/13/21 11:55 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. I included them to use the same Docker file to build Linux kernel we test. Not a blocker, this is the QEMU project, and I'd rather get the vmlinux images prebuilt from elsewhere, so: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > 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(-)
On Thu, May 13, 2021 at 12:12:33PM +0200, Philippe Mathieu-Daudé wrote: > On 5/13/21 11:55 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. > > I included them to use the same Docker file to build Linux kernel > we test. Not a blocker, this is the QEMU project, and I'd rather > get the vmlinux images prebuilt from elsewhere, so: If we want containers in which we can build the kernel, we can also create a dedicated set of dockerfiles containing only the deps that Linux kernel builds needs, separate from QEMU. > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > > 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(-) > Regards, Daniel
On 5/13/21 12:15 PM, Daniel P. Berrangé wrote: > On Thu, May 13, 2021 at 12:12:33PM +0200, Philippe Mathieu-Daudé wrote: >> On 5/13/21 11:55 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. >> >> I included them to use the same Docker file to build Linux kernel >> we test. Not a blocker, this is the QEMU project, and I'd rather >> get the vmlinux images prebuilt from elsewhere, so: > > If we want containers in which we can build the kernel, we can > also create a dedicated set of dockerfiles containing only the > deps that Linux kernel builds needs, separate from QEMU. Yes, this is how I understand lci-tool can help.
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