From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7akt-0003xh-3z for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7ako-0007wS-9h for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:43 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:35383) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7ako-0007w2-4z for qemu-devel@nongnu.org; Mon, 08 May 2017 00:58:38 -0400 Received: by mail-qk0-x244.google.com with SMTP id k74so8663341qke.2 for ; Sun, 07 May 2017 21:58:37 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 8 May 2017 01:57:05 -0300 Message-Id: <20170508045715.21770-14-f4bug@amsat.org> In-Reply-To: <20170508045715.21770-1-f4bug@amsat.org> References: <20170508045715.21770-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC PATCH 13/23] docker: add --include-file argument to 'build' command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 3 ++- tests/docker/docker.py | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ceff2c1654..47978fb56c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -51,7 +51,8 @@ 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 $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE))\ + $(if $(EXTRA_FILE),--include-file=$(EXTRA_FILE)),\ "BUILD","$*") # Enforce dependancies for composite images diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 6ddc6e4c2a..4c096a8178 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -237,6 +237,9 @@ class BuildCommand(SubCommand): help="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--include-file", "-f", + help="""Specify a binary that will be copied to the + container""") parser.add_argument("--add-current-user", "-u", dest="user", action="store_true", help="Add the current user to image's passwd") @@ -274,6 +277,8 @@ class BuildCommand(SubCommand): if args.include_executable: _copy_binary_with_libs(args.include_executable, docker_dir) + if args.include_file: + _copy_with_mkdir(args.include_file, docker_dir) argv += ["--build-arg=" + k.lower() + "=" + v for k, v in os.environ.iteritems() -- 2.11.0