diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-13 11:26:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-13 11:26:36 +0000 |
| commit | b1616fe0e2a311f5951cc51800a17a920b20a129 (patch) | |
| tree | ec5b7165f1dd51657a4feb1eb1b19339b476f0a6 /tests | |
| parent | 95b0eca46e03ffa0b20d29d1b3127c291accea39 (diff) | |
| parent | 8ba1e5f72b17584f23e17c54494bb4beeb05174e (diff) | |
| download | qemu-b1616fe0e2a311f5951cc51800a17a920b20a129.zip qemu-b1616fe0e2a311f5951cc51800a17a920b20a129.tar.gz qemu-b1616fe0e2a311f5951cc51800a17a920b20a129.tar.bz2 | |
Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging
# gpg: Signature made Fri 10 Mar 2017 07:15:38 GMT
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-pull-request:
docker/dockerfiles/debian-s390-cross: include clang
tests/docker: support proxy / corporate firewall
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/docker/docker.py | 6 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian-s390x-cross.docker | 4 |
2 files changed, 8 insertions, 2 deletions
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) 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 |