docker: add --include-files argument to 'build' command
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
parent
2499ee9fad
commit
4c84f662c2
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in a new issue