[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build
From: |
Alex Bennée |
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 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 06/21] travis: add gcovr summary for GCOV build, (continued)
- [Qemu-devel] [PATCH v2 06/21] travis: add gcovr summary for GCOV build, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 02/21] travis: test out-of-tree builds, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 07/21] build-system: add clean-coverage target, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 08/21] build-system: add coverage-report target, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 10/21] linux-user: add gcov support to preexit_cleanup, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 13/21] docker: ubuntu: Use SDL2, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 11/21] docker: filter out linux-user builds for mingw, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 12/21] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 19/21] docker: add special rule for deboostrapped images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 20/21] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 17/21] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 14/21] docker: Clean the MXE base image, Alex Bennée, 2018/06/29