[Qemu-devel] [PULL 0/2] Docker patches for 2.9

[Qemu-devel] [PULL 0/2] Docker patches for 2.9

[Fam Zheng]

The following changes since commit eba44e9339fc13c36e24c8c59e2b73ea231b46a1:

  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2017-03-06 15:13:23 +0000)

are available in the git repository at:

  git://github.com/famz/qemu.git tags/docker-pull-request

for you to fetch changes up to 8ba1e5f72b17584f23e17c54494bb4beeb05174e:

  docker/dockerfiles/debian-s390-cross: include clang (2017-03-10 15:05:22 +0800)

----------------------------------------------------------------

Hi Peter, here are two more docker patches:

- Fix for shippable.
- Improvement on proxy env var. Technically it's not a fix but since it's under
  tests/, it doesn't have to wait for the 2.10 window.

----------------------------------------------------------------

Alex Bennée (1):
  docker/dockerfiles/debian-s390-cross: include clang

Philippe Mathieu-Daudé (1):
  tests/docker: support proxy / corporate firewall

 tests/docker/docker.py                             | 6 ++++++
 tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

-- 
2.9.3

[Qemu-devel] [PULL 1/2] tests/docker: support proxy / corporate firewall

[Fam Zheng]

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

if ftp_proxy/http_proxy/https_proxy standard environment variables available,
pass them to the docker daemon to build images.
this is required when building behind corporate proxy/firewall, but also help
when using local cache server (ie: apt/yum).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170306205520.32311-1-f4bug@amsat.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/docker.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 9fd32ab..8747f6a 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -28,6 +28,9 @@ from shutil import copy, rmtree
 from pwd import getpwuid
 
 
+FILTERED_ENV_NAMES = ['ftp_proxy', 'http_proxy', 'https_proxy']
+
+
 DEVNULL = open(os.devnull, 'wb')
 
 
@@ -272,6 +275,9 @@ class BuildCommand(SubCommand):
                 _copy_binary_with_libs(args.include_executable,
                                        docker_dir)
 
+            argv += ["--build-arg=" + k.lower() + "=" + v
+                        for k, v in os.environ.iteritems()
+                        if k.lower() in FILTERED_ENV_NAMES]
             dkr.build_image(tag, docker_dir, dockerfile,
                             quiet=args.quiet, user=args.user, argv=argv)
 
-- 
2.9.3

[Qemu-devel] [PULL 2/2] docker/dockerfiles/debian-s390-cross: include clang

[Fam Zheng]

From: Alex Bennée <alex.bennee@linaro.org>

It's a silly little limitation on Shippable that is looks for clang
in the container even though we won't use it. The arm/aarch64 cross
builds inherit this from debian.docker but as we needed to use
debian-testing for this we add it here. We also collapse the update
step into one RUN line to remove and intermediate layer of the docker
build.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20170306112848.659-1-alex.bennee@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index bbb21ed..3a687fe 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -13,8 +13,8 @@ RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
 RUN dpkg --add-architecture s390x
 
 # Grab the updated list of packages
-RUN apt update
-RUN apt dist-upgrade -yy
+RUN apt update && apt dist-upgrade -yy
+RUN apt install -yy build-essential clang
 RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
 RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
 
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/2] Docker patches for 2.9

[Peter Maydell]

On 10 March 2017 at 08:20, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit eba44e9339fc13c36e24c8c59e2b73ea231b46a1:
>
>   Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging (2017-03-06 15:13:23 +0000)
>
> are available in the git repository at:
>
>   git://github.com/famz/qemu.git tags/docker-pull-request
>
> for you to fetch changes up to 8ba1e5f72b17584f23e17c54494bb4beeb05174e:
>
>   docker/dockerfiles/debian-s390-cross: include clang (2017-03-10 15:05:22 +0800)
>
> ----------------------------------------------------------------
>
> Hi Peter, here are two more docker patches:
>
> - Fix for shippable.
> - Improvement on proxy env var. Technically it's not a fix but since it's under
>   tests/, it doesn't have to wait for the 2.10 window.
>

Applied, thanks.

-- PMM