[Qemu-devel] [PATCH v2 0/8] docker: update Ubuntu and Fedora images, deprecate old ones

[Qemu-devel] [PATCH v2 0/8] docker: update Ubuntu and Fedora images, deprecate old ones

[Philippe Mathieu-Daudé]

Hi,

This series is to be clearer about which upstream version we are using.

All "FROM distrib:latest" entries have now been removed and replaced by
explicit "FROM distrib:version" ones.

To keep backward compatibility, a warning is displayed to the user,
suggesting which correct base image to use.

To be consistent, we remove the deprecated images of the "make docker" output.

Since v2:
- fix typo
- fix "Expand all the pre-requistes for each docker image and test combination":
    $ make docker-test-mingw@fedora DEBUG=1
      LD      docker-test-mingw@fedora.mo
    cc: fatal error: no input files
    compilation terminated.
    rules.mak:115: recipe for target 'docker-test-mingw@fedora.mo' failed
    make: *** [docker-test-mingw@fedora.mo] Error 1

Regards,

Phil.

Philippe Mathieu-Daudé (8):
  docker: sort images list displayed by 'make docker'
  docker: do not display deprecated images in 'make docker' help
  docker: add the Ubuntu Trusty base image
  docker: do not use Trusty APT source in Xenial
  docker: warn users to use ubuntu16.04 for the LTS Xenial image
  docker: add the Fedora 27 base image
  docker: warn users to use newer fedora25/fedora27 base image
  docker: fix typo

 tests/docker/Makefile.include               |  9 ++++++---
 tests/docker/dockerfiles/fedora.docker      | 29 ++++++++++++-----------------
 tests/docker/dockerfiles/fedora25.docker    | 18 ++++++++++++++++++
 tests/docker/dockerfiles/fedora27.docker    | 18 ++++++++++++++++++
 tests/docker/dockerfiles/ubuntu.docker      | 28 ++++++++++------------------
 tests/docker/dockerfiles/ubuntu14.04.docker | 17 +++++++++++++++++
 tests/docker/dockerfiles/ubuntu16.04.docker | 16 ++++++++++++++++
 7 files changed, 97 insertions(+), 38 deletions(-)
 create mode 100644 tests/docker/dockerfiles/fedora25.docker
 create mode 100644 tests/docker/dockerfiles/fedora27.docker
 create mode 100644 tests/docker/dockerfiles/ubuntu14.04.docker
 create mode 100644 tests/docker/dockerfiles/ubuntu16.04.docker

-- 
2.15.1

[Qemu-devel] [PATCH v2 1/8] docker: sort images list displayed by 'make docker'

[Philippe Mathieu-Daudé]

we can now directly see different version sort consecutively.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index de87341528..ef95703cef 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -4,7 +4,7 @@
 
 DOCKER_SUFFIX := .docker
 DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-DOCKER_IMAGES := $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))
+DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds
 DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
-- 
2.15.1

[Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help

[Philippe Mathieu-Daudé]

the 'debian' base image is deprecated since 3e11974988d8

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index ef95703cef..d5cf896966 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -4,7 +4,8 @@
 
 DOCKER_SUFFIX := .docker
 DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
+DOCKER_DEPRECATED_IMAGES := debian
+DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds
 DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
@@ -63,7 +64,7 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe
 docker-image-travis: NOUSER=1
 
 # Expand all the pre-requistes for each docker image and test combination
-$(foreach i,$(DOCKER_IMAGES), \
+$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
 	$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
 		$(eval .PHONY: docker-$t@$i) \
 		$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
-- 
2.15.1

[Qemu-devel] [PATCH v2 3/8] docker: add the Ubuntu Trusty base image

[Philippe Mathieu-Daudé]

based on QEMU v2.10 ubuntu.docker (ca853f0c76e3 and 2346b12fc52d)

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/ubuntu14.04.docker | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tests/docker/dockerfiles/ubuntu14.04.docker

diff --git a/tests/docker/dockerfiles/ubuntu14.04.docker b/tests/docker/dockerfiles/ubuntu14.04.docker
new file mode 100644
index 0000000000..cd24e759a7
--- /dev/null
+++ b/tests/docker/dockerfiles/ubuntu14.04.docker
@@ -0,0 +1,17 @@
+FROM ubuntu:14.04
+RUN apt-get update
+ENV PACKAGES flex bison \
+    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
+    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
+    libspice-protocol-dev libnss3-dev libfdt-dev \
+    libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
+    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
+    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
+    libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
+    libjemalloc-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \
+    texinfo dpkg-dev \
+    gettext git make ccache python-yaml gcc clang sparse
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install $PACKAGES
+RUN dpkg -l $PACKAGES | sort > /packages.txt
+ENV FEATURES clang pyyaml
+ENV QEMU_CONFIGURE_OPTS --disable-opengl
-- 
2.15.1

[Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

[Philippe Mathieu-Daudé]

probably missed in 7fc581c29518

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/ubuntu.docker | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index dabbf2a8a4..686d90ae8c 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -1,6 +1,4 @@
 FROM ubuntu:16.04
-RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
-    /etc/apt/sources.list
 RUN apt-get update
 ENV PACKAGES flex bison \
     libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
-- 
2.15.1

[Qemu-devel] [PATCH v2 5/8] docker: warn users to use ubuntu16.04 for the LTS Xenial image

[Philippe Mathieu-Daudé]

deprecate the generic 'ubuntu' image, but stay backward incompatible

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include               |  3 ++-
 tests/docker/dockerfiles/ubuntu.docker      | 26 ++++++++++----------------
 tests/docker/dockerfiles/ubuntu16.04.docker | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 tests/docker/dockerfiles/ubuntu16.04.docker

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index d5cf896966..1adea40499 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -4,7 +4,7 @@
 
 DOCKER_SUFFIX := .docker
 DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-DOCKER_DEPRECATED_IMAGES := debian
+DOCKER_DEPRECATED_IMAGES := debian ubuntu
 DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds
@@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9
 docker-image-debian-s390x-cross: docker-image-debian9
 docker-image-debian-win32-cross: docker-image-debian8-mxe
 docker-image-debian-win64-cross: docker-image-debian8-mxe
+docker-image-ubuntu: docker-image-ubuntu16.04
 docker-image-travis: NOUSER=1
 
 # Expand all the pre-requistes for each docker image and test combination
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index 686d90ae8c..808ea2bf38 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -1,16 +1,10 @@
-FROM ubuntu:16.04
-RUN apt-get update
-ENV PACKAGES flex bison \
-    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
-    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
-    libspice-protocol-dev libnss3-dev libfdt-dev \
-    libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
-    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
-    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
-    libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
-    libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \
-    texinfo \
-    gettext git make ccache python-yaml gcc clang sparse
-RUN apt-get -y install $PACKAGES
-RUN dpkg -l $PACKAGES | sort > /packages.txt
-ENV FEATURES clang pyyaml
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# This template is deprecated, it was previously based on Xenial on QEMU 2.11.
+#
+FROM qemu:ubuntu16.04
+
+RUN for n in $(seq 8); do echo; done && \
+    echo "\n\t\tThis image is deprecated." && echo && \
+    echo "\tUse 'FROM qemu:ubuntu16.04' to use the Ubuntu Xenial LTS image" && \
+    for n in $(seq 8); do echo; done
diff --git a/tests/docker/dockerfiles/ubuntu16.04.docker b/tests/docker/dockerfiles/ubuntu16.04.docker
new file mode 100644
index 0000000000..ce7c5d3d33
--- /dev/null
+++ b/tests/docker/dockerfiles/ubuntu16.04.docker
@@ -0,0 +1,16 @@
+FROM ubuntu:16.04
+RUN apt-get update
+ENV PACKAGES flex bison \
+    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
+    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
+    libspice-protocol-dev libnss3-dev libfdt-dev \
+    libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
+    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
+    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
+    libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
+    libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \
+    texinfo \
+    gettext git make ccache python-yaml gcc clang sparse
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install $PACKAGES
+RUN dpkg -l $PACKAGES | sort > /packages.txt
+ENV FEATURES clang pyyaml
-- 
2.15.1

[Qemu-devel] [PATCH v2 6/8] docker: add the Fedora 27 base image

[Philippe Mathieu-Daudé]

straight copy on Fedora 25 base.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 tests/docker/dockerfiles/fedora27.docker

diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker
new file mode 100644
index 0000000000..7cba4dcc2c
--- /dev/null
+++ b/tests/docker/dockerfiles/fedora27.docker
@@ -0,0 +1,18 @@
+FROM fedora:27
+ENV PACKAGES \
+    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
+    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
+    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
+    nettle-devel \
+    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
+    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
+    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
+    mingw32-bzip2 \
+    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
+    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
+    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
+    mingw64-bzip2
+
+RUN dnf install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV FEATURES mingw clang pyyaml
-- 
2.15.1

[Qemu-devel] [PATCH v2 7/8] docker: warn users to use newer fedora25/fedora27 base image

[Philippe Mathieu-Daudé]

deprecate the generic 'fedora' image, but stay backward incompatible

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include            |  3 ++-
 tests/docker/dockerfiles/fedora.docker   | 29 ++++++++++++-----------------
 tests/docker/dockerfiles/fedora25.docker | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 tests/docker/dockerfiles/fedora25.docker

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 1adea40499..950ef51d35 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -4,7 +4,7 @@
 
 DOCKER_SUFFIX := .docker
 DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
-DOCKER_DEPRECATED_IMAGES := debian ubuntu
+DOCKER_DEPRECATED_IMAGES := debian fedora ubuntu
 DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
 DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
 # Use a global constant ccache directory to speed up repetitive builds
@@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9
 docker-image-debian-s390x-cross: docker-image-debian9
 docker-image-debian-win32-cross: docker-image-debian8-mxe
 docker-image-debian-win64-cross: docker-image-debian8-mxe
+docker-image-fedora: docker-image-fedora25
 docker-image-ubuntu: docker-image-ubuntu16.04
 docker-image-travis: NOUSER=1
 
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 4b26c3aded..961534275f 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,18 +1,13 @@
-FROM fedora:latest
-ENV PACKAGES \
-    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
-    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
-    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
-    nettle-devel \
-    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
-    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
-    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
-    mingw32-bzip2 \
-    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
-    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
-    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
-    mingw64-bzip2
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# This template is deprecated, it was previously based on Fedora 25 on QEMU 2.9.
+# Now than more recent releases are out, please use qemu:fedora25 as base for
+# Fedora 25.
+#
+FROM qemu:fedora25
 
-RUN dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
-ENV FEATURES mingw clang pyyaml
+RUN for n in $(seq 8); do echo; done && \
+    echo "\n\t\tThis image is deprecated." && echo && \
+    echo "\tUse 'FROM qemu:fedora27' to use the Fedora 27 image" && \
+    echo "\tor 'FROM qemu:fedora25' to use the old Fedora 25." && \
+    for n in $(seq 8); do echo; done
diff --git a/tests/docker/dockerfiles/fedora25.docker b/tests/docker/dockerfiles/fedora25.docker
new file mode 100644
index 0000000000..b53fe63b5c
--- /dev/null
+++ b/tests/docker/dockerfiles/fedora25.docker
@@ -0,0 +1,18 @@
+FROM fedora:25
+ENV PACKAGES \
+    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
+    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
+    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
+    nettle-devel \
+    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
+    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
+    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
+    mingw32-bzip2 \
+    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
+    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
+    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
+    mingw64-bzip2
+
+RUN dnf install -y $PACKAGES
+RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV FEATURES mingw clang pyyaml
-- 
2.15.1

[Qemu-devel] [PATCH v2 8/8] docker: fix typo

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 950ef51d35..a833c68cd8 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -47,7 +47,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
 
 docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh
 
-# Enforce dependancies for composite images
+# Enforce dependencies for composite images
 docker-image-debian: docker-image-debian9
 docker-image-debian8-mxe: docker-image-debian8
 docker-image-debian-amd64: docker-image-debian9
-- 
2.15.1

Re: [Qemu-devel] [PATCH v2 3/8] docker: add the Ubuntu Trusty base image

[Daniel P. Berrange]

On Mon, Jan 15, 2018 at 11:34:54AM -0300, Philippe Mathieu-Daudé wrote:
> based on QEMU v2.10 ubuntu.docker (ca853f0c76e3 and 2346b12fc52d)
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/dockerfiles/ubuntu14.04.docker | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/ubuntu14.04.docker
> 
> diff --git a/tests/docker/dockerfiles/ubuntu14.04.docker b/tests/docker/dockerfiles/ubuntu14.04.docker
> new file mode 100644
> index 0000000000..cd24e759a7
> --- /dev/null
> +++ b/tests/docker/dockerfiles/ubuntu14.04.docker
> @@ -0,0 +1,17 @@
> +FROM ubuntu:14.04
> +RUN apt-get update
> +ENV PACKAGES flex bison \
> +    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
> +    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
> +    libspice-protocol-dev libnss3-dev libfdt-dev \
> +    libgtk-3-dev libvte-2.90-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \

Perhaps use SDL 2, instead of 1.2 series, since we're deprecating SDL 1.2
in this release...

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH v2 6/8] docker: add the Fedora 27 base image

[Daniel P. Berrange]

On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote:
> straight copy on Fedora 25 base.
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/fedora27.docker
> 
> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker
> new file mode 100644
> index 0000000000..7cba4dcc2c
> --- /dev/null
> +++ b/tests/docker/dockerfiles/fedora27.docker
> @@ -0,0 +1,18 @@
> +FROM fedora:27
> +ENV PACKAGES \
> +    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
> +    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \

Perhaps SDL2 here too

> +    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
> +    nettle-devel \
> +    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
> +    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \

Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2
and configure will pick GTK3 by default. IIUC there's no way to override
that in the docker builds to force GTK2, so it can possibly be dropped.

> +    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
> +    mingw32-bzip2 \
> +    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
> +    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \

Repeated here.

> +    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
> +    mingw64-bzip2
> +
> +RUN dnf install -y $PACKAGES
> +RUN rpm -q $PACKAGES | sort > /packages.txt
> +ENV FEATURES mingw clang pyyaml

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH v2 6/8] docker: add the Fedora 27 base image

[Philippe Mathieu-Daudé]

On 01/15/2018 01:27 PM, Daniel P. Berrange wrote:
> On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote:
>> straight copy on Fedora 25 base.
>>
>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++
>>  1 file changed, 18 insertions(+)
>>  create mode 100644 tests/docker/dockerfiles/fedora27.docker
>>
>> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker
>> new file mode 100644
>> index 0000000000..7cba4dcc2c
>> --- /dev/null
>> +++ b/tests/docker/dockerfiles/fedora27.docker
>> @@ -0,0 +1,18 @@
>> +FROM fedora:27
>> +ENV PACKAGES \
>> +    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
>> +    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
> 
> Perhaps SDL2 here too
> 
>> +    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
>> +    nettle-devel \
>> +    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
>> +    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
> 
> Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2
> and configure will pick GTK3 by default. IIUC there's no way to override
> that in the docker builds to force GTK2, so it can possibly be dropped.

No clue, Fam?

>> +    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
>> +    mingw32-bzip2 \
>> +    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
>> +    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
> 
> Repeated here.
> 
>> +    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
>> +    mingw64-bzip2
>> +
>> +RUN dnf install -y $PACKAGES
>> +RUN rpm -q $PACKAGES | sort > /packages.txt
>> +ENV FEATURES mingw clang pyyaml
> 
> Regards,
> Daniel
> 

Re: [Qemu-devel] [PATCH v2 6/8] docker: add the Fedora 27 base image

[Philippe Mathieu-Daudé]

On 01/15/2018 01:38 PM, Philippe Mathieu-Daudé wrote:
> On 01/15/2018 01:27 PM, Daniel P. Berrange wrote:
>> On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote:
>>> straight copy on Fedora 25 base.
>>>
>>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>>  tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++
>>>  1 file changed, 18 insertions(+)
>>>  create mode 100644 tests/docker/dockerfiles/fedora27.docker
>>>
>>> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker
>>> new file mode 100644
>>> index 0000000000..7cba4dcc2c
>>> --- /dev/null
>>> +++ b/tests/docker/dockerfiles/fedora27.docker
>>> @@ -0,0 +1,18 @@
>>> +FROM fedora:27
>>> +ENV PACKAGES \
>>> +    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
>>> +    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
>>
>> Perhaps SDL2 here too
>>
>>> +    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
>>> +    nettle-devel \
>>> +    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
>>> +    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
>>
>> Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2
>> and configure will pick GTK3 by default. IIUC there's no way to override
>> that in the docker builds to force GTK2, so it can possibly be dropped.
> 
> No clue, Fam?

This series no longer applies since the c08d08b27cad "Build fedora image
with ASAN/UBSan", I'll respin.

Now since GTK2+3 are use in this docker image since it's origin, I'll
wait for Fam to confirm we can drop GTK2.

>>> +    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
>>> +    mingw32-bzip2 \
>>> +    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
>>> +    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
>>
>> Repeated here.
>>
>>> +    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
>>> +    mingw64-bzip2
>>> +
>>> +RUN dnf install -y $PACKAGES
>>> +RUN rpm -q $PACKAGES | sort > /packages.txt
>>> +ENV FEATURES mingw clang pyyaml

Re: [Qemu-devel] [PATCH v2 6/8] docker: add the Fedora 27 base image

[Fam Zheng]

On Tue, Jan 16, 2018 at 12:38 AM, Philippe Mathieu-Daudé
<f4bug@amsat.org> wrote:
> On 01/15/2018 01:27 PM, Daniel P. Berrange wrote:
>> On Mon, Jan 15, 2018 at 11:34:57AM -0300, Philippe Mathieu-Daudé wrote:
>>> straight copy on Fedora 25 base.
>>>
>>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>>  tests/docker/dockerfiles/fedora27.docker | 18 ++++++++++++++++++
>>>  1 file changed, 18 insertions(+)
>>>  create mode 100644 tests/docker/dockerfiles/fedora27.docker
>>>
>>> diff --git a/tests/docker/dockerfiles/fedora27.docker b/tests/docker/dockerfiles/fedora27.docker
>>> new file mode 100644
>>> index 0000000000..7cba4dcc2c
>>> --- /dev/null
>>> +++ b/tests/docker/dockerfiles/fedora27.docker
>>> @@ -0,0 +1,18 @@
>>> +FROM fedora:27
>>> +ENV PACKAGES \
>>> +    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
>>> +    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
>>
>> Perhaps SDL2 here too
>>
>>> +    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
>>> +    nettle-devel \
>>> +    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
>>> +    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
>>
>> Is there a reason we have both GTK2 and GTK3 installed ? We've deprecated GTK2
>> and configure will pick GTK3 by default. IIUC there's no way to override
>> that in the docker builds to force GTK2, so it can possibly be dropped.
>
> No clue, Fam?
>

I think Dan is right here.

Fam

Re: [Qemu-devel] [PATCH v2 1/8] docker: sort images list displayed by 'make docker'

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> we can now directly see different version sort consecutively.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index de87341528..ef95703cef 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -4,7 +4,7 @@
>
>  DOCKER_SUFFIX := .docker
>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> -DOCKER_IMAGES := $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))
> +DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>  # Use a global constant ccache directory to speed up repetitive builds
>  DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 1/8] docker: sort images list displayed by 'make docker'

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> we can now directly see different version sort consecutively.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

I of course meant:

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


> ---
>  tests/docker/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index de87341528..ef95703cef 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -4,7 +4,7 @@
>
>  DOCKER_SUFFIX := .docker
>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> -DOCKER_IMAGES := $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))
> +DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>  # Use a global constant ccache directory to speed up repetitive builds
>  DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 7/8] docker: warn users to use newer fedora25/fedora27 base image

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> deprecate the generic 'fedora' image, but stay backward incompatible
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

What clashed with this?

> ---
>  tests/docker/Makefile.include            |  3 ++-
>  tests/docker/dockerfiles/fedora.docker   | 29 ++++++++++++-----------------
>  tests/docker/dockerfiles/fedora25.docker | 18 ++++++++++++++++++
>  3 files changed, 32 insertions(+), 18 deletions(-)
>  create mode 100644 tests/docker/dockerfiles/fedora25.docker
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 1adea40499..950ef51d35 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -4,7 +4,7 @@
>
>  DOCKER_SUFFIX := .docker
>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> -DOCKER_DEPRECATED_IMAGES := debian ubuntu
> +DOCKER_DEPRECATED_IMAGES := debian fedora ubuntu
>  DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>  # Use a global constant ccache directory to speed up repetitive builds
> @@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9
>  docker-image-debian-s390x-cross: docker-image-debian9
>  docker-image-debian-win32-cross: docker-image-debian8-mxe
>  docker-image-debian-win64-cross: docker-image-debian8-mxe
> +docker-image-fedora: docker-image-fedora25
>  docker-image-ubuntu: docker-image-ubuntu16.04
>  docker-image-travis: NOUSER=1
>
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index 4b26c3aded..961534275f 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -1,18 +1,13 @@
> -FROM fedora:latest
> -ENV PACKAGES \
> -    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
> -    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
> -    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
> -    nettle-devel \
> -    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
> -    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
> -    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
> -    mingw32-bzip2 \
> -    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
> -    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
> -    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
> -    mingw64-bzip2
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +#
> +# This template is deprecated, it was previously based on Fedora 25 on QEMU 2.9.
> +# Now than more recent releases are out, please use qemu:fedora25 as base for
> +# Fedora 25.
> +#
> +FROM qemu:fedora25
>
> -RUN dnf install -y $PACKAGES
> -RUN rpm -q $PACKAGES | sort > /packages.txt
> -ENV FEATURES mingw clang pyyaml
> +RUN for n in $(seq 8); do echo; done && \
> +    echo "\n\t\tThis image is deprecated." && echo && \
> +    echo "\tUse 'FROM qemu:fedora27' to use the Fedora 27 image" && \
> +    echo "\tor 'FROM qemu:fedora25' to use the old Fedora 25." && \
> +    for n in $(seq 8); do echo; done
> diff --git a/tests/docker/dockerfiles/fedora25.docker b/tests/docker/dockerfiles/fedora25.docker
> new file mode 100644
> index 0000000000..b53fe63b5c
> --- /dev/null
> +++ b/tests/docker/dockerfiles/fedora25.docker
> @@ -0,0 +1,18 @@
> +FROM fedora:25
> +ENV PACKAGES \
> +    ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname \
> +    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \
> +    gcc gcc-c++ clang make perl which bc findutils libaio-devel \
> +    nettle-devel \
> +    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \
> +    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \
> +    mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 \
> +    mingw32-bzip2 \
> +    mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config \
> +    mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 \
> +    mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \
> +    mingw64-bzip2
> +
> +RUN dnf install -y $PACKAGES
> +RUN rpm -q $PACKAGES | sort > /packages.txt
> +ENV FEATURES mingw clang pyyaml


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> the 'debian' base image is deprecated since 3e11974988d8
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/Makefile.include | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index ef95703cef..d5cf896966 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -4,7 +4,8 @@
>
>  DOCKER_SUFFIX := .docker
>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> -DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
> +DOCKER_DEPRECATED_IMAGES := debian
> +DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>  # Use a global constant ccache directory to speed up repetitive builds
>  DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
> @@ -63,7 +64,7 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe
>  docker-image-travis: NOUSER=1
>
>  # Expand all the pre-requistes for each docker image and test combination
> -$(foreach i,$(DOCKER_IMAGES), \
> +$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
>  	$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
>  		$(eval .PHONY: docker-$t@$i) \
>  		$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> probably missed in 7fc581c29518
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/dockerfiles/ubuntu.docker | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index dabbf2a8a4..686d90ae8c 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -1,6 +1,4 @@
>  FROM ubuntu:16.04
> -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
> -    /etc/apt/sources.list
>  RUN apt-get update
>  ENV PACKAGES flex bison \
>      libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> probably missed in 7fc581c29518
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  tests/docker/dockerfiles/ubuntu.docker | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index dabbf2a8a4..686d90ae8c 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -1,6 +1,4 @@
>  FROM ubuntu:16.04
> -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
> -    /etc/apt/sources.list

do we not need anything in universe or multiverse?

>  RUN apt-get update
>  ENV PACKAGES flex bison \
>      libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 5/8] docker: warn users to use ubuntu16.04 for the LTS Xenial image

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> deprecate the generic 'ubuntu' image, but stay backward incompatible
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/Makefile.include               |  3 ++-
>  tests/docker/dockerfiles/ubuntu.docker      | 26 ++++++++++----------------
>  tests/docker/dockerfiles/ubuntu16.04.docker | 16 ++++++++++++++++
>  3 files changed, 28 insertions(+), 17 deletions(-)
>  create mode 100644 tests/docker/dockerfiles/ubuntu16.04.docker
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index d5cf896966..1adea40499 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -4,7 +4,7 @@
>
>  DOCKER_SUFFIX := .docker
>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
> -DOCKER_DEPRECATED_IMAGES := debian
> +DOCKER_DEPRECATED_IMAGES := debian ubuntu
>  DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>  # Use a global constant ccache directory to speed up repetitive builds
> @@ -61,6 +61,7 @@ docker-image-debian-ppc64el-cross: docker-image-debian9
>  docker-image-debian-s390x-cross: docker-image-debian9
>  docker-image-debian-win32-cross: docker-image-debian8-mxe
>  docker-image-debian-win64-cross: docker-image-debian8-mxe
> +docker-image-ubuntu: docker-image-ubuntu16.04
>  docker-image-travis: NOUSER=1
>
>  # Expand all the pre-requistes for each docker image and test combination
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index 686d90ae8c..808ea2bf38 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -1,16 +1,10 @@
> -FROM ubuntu:16.04
> -RUN apt-get update
> -ENV PACKAGES flex bison \
> -    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
> -    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
> -    libspice-protocol-dev libnss3-dev libfdt-dev \
> -    libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
> -    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
> -    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
> -    libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
> -    libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \
> -    texinfo \
> -    gettext git make ccache python-yaml gcc clang sparse
> -RUN apt-get -y install $PACKAGES
> -RUN dpkg -l $PACKAGES | sort > /packages.txt
> -ENV FEATURES clang pyyaml
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +#
> +# This template is deprecated, it was previously based on Xenial on QEMU 2.11.
> +#
> +FROM qemu:ubuntu16.04
> +
> +RUN for n in $(seq 8); do echo; done && \
> +    echo "\n\t\tThis image is deprecated." && echo && \
> +    echo "\tUse 'FROM qemu:ubuntu16.04' to use the Ubuntu Xenial LTS image" && \
> +    for n in $(seq 8); do echo; done
> diff --git a/tests/docker/dockerfiles/ubuntu16.04.docker b/tests/docker/dockerfiles/ubuntu16.04.docker
> new file mode 100644
> index 0000000000..ce7c5d3d33
> --- /dev/null
> +++ b/tests/docker/dockerfiles/ubuntu16.04.docker
> @@ -0,0 +1,16 @@
> +FROM ubuntu:16.04
> +RUN apt-get update
> +ENV PACKAGES flex bison \
> +    libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
> +    libseccomp-dev libgnutls-dev libssh2-1-dev  libspice-server-dev \
> +    libspice-protocol-dev libnss3-dev libfdt-dev \
> +    libgtk-3-dev libvte-2.91-dev libsdl1.2-dev libpng12-dev libpixman-1-dev \
> +    libvdeplug-dev liblzo2-dev libsnappy-dev libbz2-dev libxen-dev librdmacm-dev libibverbs-dev \
> +    libsasl2-dev libjpeg-turbo8-dev xfslibs-dev libcap-ng-dev libbrlapi-dev libcurl4-gnutls-dev \
> +    libbluetooth-dev librbd-dev libaio-dev glusterfs-common libnuma-dev libepoxy-dev libdrm-dev libgbm-dev \
> +    libjemalloc-dev libcacard-dev libusbredirhost-dev libnfs-dev libcap-dev libattr1-dev \
> +    texinfo \
> +    gettext git make ccache python-yaml gcc clang sparse
> +RUN DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install $PACKAGES
> +RUN dpkg -l $PACKAGES | sort > /packages.txt
> +ENV FEATURES clang pyyaml


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 8/8] docker: fix typo

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/docker/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index 950ef51d35..a833c68cd8 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -47,7 +47,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
>
>  docker-image-debian-powerpc-cross: EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-apt-fake.sh
>
> -# Enforce dependancies for composite images
> +# Enforce dependencies for composite images
>  docker-image-debian: docker-image-debian9
>  docker-image-debian8-mxe: docker-image-debian8
>  docker-image-debian-amd64: docker-image-debian9


--
Alex Bennée

Re: [Qemu-devel] [PATCH v2 4/8] docker: do not use Trusty APT source in Xenial

[Philippe Mathieu-Daudé]

On 01/17/2018 08:54 AM, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
> 
>> probably missed in 7fc581c29518
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>  tests/docker/dockerfiles/ubuntu.docker | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
>> index dabbf2a8a4..686d90ae8c 100644
>> --- a/tests/docker/dockerfiles/ubuntu.docker
>> +++ b/tests/docker/dockerfiles/ubuntu.docker
>> @@ -1,6 +1,4 @@
>>  FROM ubuntu:16.04
>> -RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \
>> -    /etc/apt/sources.list
> 
> do we not need anything in universe or multiverse?

Since this image is Xenial based, surely not from Trusty :)

This line is now included in the base image, I'll update the commit
description.

> 
>>  RUN apt-get update
>>  ENV PACKAGES flex bison \
>>      libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev libncursesw5-dev \
> 
> 
> --
> Alex Bennée
> 

Re: [Qemu-devel] [PATCH v2 1/8] docker: sort images list displayed by 'make docker'

[Philippe Mathieu-Daudé]

Hi Alex,

On 01/17/2018 06:37 AM, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
> 
>> we can now directly see different version sort consecutively.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> I of course meant:
> 
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Can you queue this patch please?

> 
> 
>> ---
>>  tests/docker/Makefile.include | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index de87341528..ef95703cef 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -4,7 +4,7 @@
>>
>>  DOCKER_SUFFIX := .docker
>>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
>> -DOCKER_IMAGES := $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))
>> +DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
>>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>>  # Use a global constant ccache directory to speed up repetitive builds
>>  DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
> 
> 
> --
> Alex Bennée
> 

Re: [Qemu-devel] [PATCH v2 2/8] docker: do not display deprecated images in 'make docker' help

[Philippe Mathieu-Daudé]

Hi Alex,

On 01/17/2018 08:01 AM, Alex Bennée wrote:
> 
> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
> 
>> the 'debian' base image is deprecated since 3e11974988d8
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Can you also queue this patch?

> 
>> ---
>>  tests/docker/Makefile.include | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index ef95703cef..d5cf896966 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -4,7 +4,8 @@
>>
>>  DOCKER_SUFFIX := .docker
>>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
>> -DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
>> +DOCKER_DEPRECATED_IMAGES := debian
>> +DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))))
>>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>>  # Use a global constant ccache directory to speed up repetitive builds
>>  DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
>> @@ -63,7 +64,7 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe
>>  docker-image-travis: NOUSER=1
>>
>>  # Expand all the pre-requistes for each docker image and test combination
>> -$(foreach i,$(DOCKER_IMAGES), \
>> +$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \
>>  	$(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \
>>  		$(eval .PHONY: docker-$t@$i) \
>>  		$(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \
> 
> 
> --
> Alex Bennée
> 

Re: [Qemu-devel] [PATCH v2 1/8] docker: sort images list displayed by 'make docker'

[Alex Bennée]

Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> Hi Alex,
>
> On 01/17/2018 06:37 AM, Alex Bennée wrote:
>>
>> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
>>
>>> we can now directly see different version sort consecutively.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>
>> I of course meant:
>>
>> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
>
> Can you queue this patch please?

queued - I send out a round-up series in a bit
>
>>
>>
>>> ---
>>>  tests/docker/Makefile.include | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>>> index de87341528..ef95703cef 100644
>>> --- a/tests/docker/Makefile.include
>>> +++ b/tests/docker/Makefile.include
>>> @@ -4,7 +4,7 @@
>>>
>>>  DOCKER_SUFFIX := .docker
>>>  DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
>>> -DOCKER_IMAGES := $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))
>>> +DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
>>>  DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
>>>  # Use a global constant ccache directory to speed up repetitive builds
>>>  DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache
>>
>>
>> --
>> Alex Bennée
>>


--
Alex Bennée