[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/21] docker: add --include-files argument to 'build
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 03/21] docker: add --include-files argument to 'build' command |
Date: |
Wed, 21 Jun 2017 15:47:56 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 0ed8c3d323..61cc0d14e2 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=<path> Include executable in image.'
+ @echo ' EXTRA_FILES="<path> [... <path>]"'
+ @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..10fa907905 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -237,6 +237,10 @@ 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 copied in the
+ Docker image, fulfilling the ADD directive from the
+ Dockerfile""")
parser.add_argument("--add-current-user", "-u", dest="user",
action="store_true",
help="Add the current user to image's passwd")
@@ -270,10 +274,12 @@ class BuildCommand(SubCommand):
print "%s exited with code %d" % (docker_pre, rc)
return 1
- # Do we include a extra binary?
+ # Copy any extra files into the Docker context. These can be
+ # included by the use of the ADD directive in 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()
--
2.13.0
- [Qemu-devel] [PULL 00/21] Docker and shippable updates, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 02/21] docker: let _copy_with_mkdir() sub_path argument be optional, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 05/21] docker: install ca-certificates package in base image, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 01/21] docker: update qemu:debian base following stretch release, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 11/21] docker: add extra libs to arm64 target to extend codebase coverage, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 03/21] docker: add --include-files argument to 'build' command,
Alex Bennée <=
- [Qemu-devel] [PULL 16/21] shippable: do not initialize submodules automatically, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 04/21] docker: rebuild image if 'extra files' checksum does not match, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 10/21] docker: add extra libs to armhf target to extend codebase coverage, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 08/21] docker: use eatmydata in debian armhf image, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 06/21] docker: use better regex to generate deb-src entries, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 07/21] docker: use eatmydata, install common build packages in base image, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 09/21] docker: use eatmydata in debian arm64 image, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 21/21] MAINTAINERS: self-appoint me as reviewer in build/test automation, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 12/21] docker: add extra libs to s390x target to extend codebase coverage, Alex Bennée, 2017/06/21
- [Qemu-devel] [PULL 15/21] shippable: build using all available cpus, Alex Bennée, 2017/06/21