From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCkHR-0004CK-UC for qemu-devel@nongnu.org; Mon, 22 May 2017 06:09:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dCkHO-0006wU-PP for qemu-devel@nongnu.org; Mon, 22 May 2017 06:09:37 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dCkHO-0006w8-Iu for qemu-devel@nongnu.org; Mon, 22 May 2017 06:09:34 -0400 Received: by mail-wm0-x231.google.com with SMTP id b84so293649202wmh.0 for ; Mon, 22 May 2017 03:09:34 -0700 (PDT) References: <20170521032956.27446-1-f4bug@amsat.org> <20170521032956.27446-3-f4bug@amsat.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20170521032956.27446-3-f4bug@amsat.org> Date: Mon, 22 May 2017 11:09:27 +0100 Message-ID: <87k25942zs.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v3 02/24] docker: add --include-files argument to 'build' command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Fam Zheng Philippe Mathieu-Daudé writes: > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée > --- > tests/docker/Makefile.include | 5 ++++- > tests/docker/docker.py | 12 +++++++++--- > 2 files changed, 13 insertions(+), 4 deletions(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 03eda37bf4..fe1a9a53ff 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -51,6 +51,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker > $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ > $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ > $(if $(NOUSER),,--add-current-user) \ > + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ > $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ > "BUILD","$*") > > @@ -107,6 +108,8 @@ docker: > @echo ' NOUSER Define to disable adding current user to containers passwd.' > @echo ' NOCACHE=1 Ignore cache when build images.' > @echo ' EXECUTABLE= Include executable in image.' > + @echo ' EXTRA_FILES=" [... ]"' > + @echo ' Include extra files in image.' > > # This rule if for directly running against an arbitrary docker target. > # It is called by the expanded docker targets (e.g. make > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index 6ddc6e4c2a..68cca25f89 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -237,6 +237,11 @@ class BuildCommand(SubCommand): > help="""Specify a binary that will be copied to the > container together with all its dependent > libraries""") > + parser.add_argument("--extra-files", "-f", nargs='*', > + help="""Specify files that will be sent to the > + Docker daemon. The daemon will copy those files into > + the built image. The ADD directive of the Dockerfile > + specify where a file is placed into the image""") > parser.add_argument("--add-current-user", "-u", dest="user", > action="store_true", > help="Add the current user to image's passwd") > @@ -270,10 +275,11 @@ class BuildCommand(SubCommand): > print "%s exited with code %d" % (docker_pre, rc) > return 1 > > - # Do we include a extra binary? > + # Include files used by ADD directives found within the Dockerfile. > if args.include_executable: > - _copy_binary_with_libs(args.include_executable, > - docker_dir) > + _copy_binary_with_libs(args.include_executable, docker_dir) > + for filename in args.extra_files or []: > + _copy_with_mkdir(filename, docker_dir) > > argv += ["--build-arg=" + k.lower() + "=" + v > for k, v in os.environ.iteritems() -- Alex Bennée