qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
	f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
	aurelien@aurel32.net, agraf@suse.de
Cc: pbonzini@redhat.com, qemu-devel@nongnu.org,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step
Date: Fri, 29 Jun 2018 21:52:27 +0100	[thread overview]
Message-ID: <20180629205232.27190-17-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org>

We need to pass environment variables down to the debbootstrap.pre
script to be able to specify build parameters.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/docker.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index b279836154..388e86ada2 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -293,6 +293,8 @@ class BuildCommand(SubCommand):
         parser.add_argument("--add-current-user", "-u", dest="user",
                             action="store_true",
                             help="Add the current user to image's passwd")
+        parser.add_argument("--env", "-E", action='append', nargs=1,
+                            help="Set FOO=BAR in envronment")
         parser.add_argument("tag",
                             help="Image Tag")
         parser.add_argument("dockerfile",
@@ -302,6 +304,12 @@ class BuildCommand(SubCommand):
         dockerfile = open(args.dockerfile, "rb").read()
         tag = args.tag
 
+        # Process env setting
+        if args.env:
+            for e in args.env:
+                (env, val) = e[0].split("=")
+                os.environ[env] = val
+
         dkr = Docker()
         if "--no-cache" not in argv and \
            dkr.image_matches_dockerfile(tag, dockerfile):
-- 
2.17.1

  parent reply	other threads:[~2018-06-29 20:52 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-29 20:52 [Qemu-devel] [PATCH v2 00/21] Travis, Code Coverage and Cross Build updates Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 01/21] travis: do not waste time cloning unused submodules Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 02/21] travis: test out-of-tree builds Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 03/21] build-system: remove per-test GCOV reporting Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 04/21] .gitignore: add .gcov files Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 05/21] docker: add gcovr to travis image Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 06/21] travis: add gcovr summary for GCOV build Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 07/21] build-system: add clean-coverage target Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 08/21] build-system: add coverage-report target Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 10/21] linux-user: add gcov support to preexit_cleanup Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 11/21] docker: filter out linux-user builds for mingw Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 12/21] docker: ubuntu: Update the package list before installing new ones Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 13/21] docker: ubuntu: Use SDL2 Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 14/21] docker: Clean the MXE base image Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images Alex Bennée
2018-06-29 20:52 ` Alex Bennée [this message]
2018-07-02 13:28   ` [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 17/21] docker: drop QEMU build-dep from bootstrap Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 19/21] docker: add special rule for deboostrapped images Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 20/21] docker: add linux-user powered cross builder for QEMU Alex Bennée
2018-06-29 20:52 ` [Qemu-devel] [PATCH v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu Alex Bennée
2018-07-01 21:26   ` Alex Bennée
2018-07-02  1:53 ` [Qemu-devel] [PATCH v2 00/21] Travis, Code Coverage and Cross Build updates no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180629205232.27190-17-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=agraf@suse.de \
    --cc=aurelien@aurel32.net \
    --cc=balrogg@gmail.com \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=f4bug@amsat.org \
    --cc=famz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).