ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker.py/build: support -t and -f arguments 

The docker.py command line is subtly different from docker and podman's,
in that the tag and Dockerfile are passed via positional arguments.
Remove this gratuitous difference and just parse -f and -t.

-f was previously used by --extra-files, only keep the long option.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-04-22 10:17:08 -04:00
parent 31d321c2b3
commit dfae628459
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/docker/Makefile.include
View File

@ -55,7 +55,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
else else
docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-image-%: $(DOCKER_FILES_DIR)/%.docker
$(call quiet-command,\ $(call quiet-command,\
$(DOCKER_SCRIPT) build qemu:$* $< \ $(DOCKER_SCRIPT) build -t qemu:$* -f $< \
$(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \
$(if $(NOUSER),,--add-current-user) \ $(if $(NOUSER),,--add-current-user) \
$(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\

6
tests/docker/docker.py
View File

@ -392,16 +392,16 @@ class BuildCommand(SubCommand):
help="""Specify a binary that will be copied to the help="""Specify a binary that will be copied to the
container together with all its dependent container together with all its dependent
libraries""") libraries""")
parser.add_argument("--extra-files", "-f", nargs='*', parser.add_argument("--extra-files", nargs='*',
help="""Specify files that will be copied in the help="""Specify files that will be copied in the
Docker image, fulfilling the ADD directive from the Docker image, fulfilling the ADD directive from the
Dockerfile""") Dockerfile""")
parser.add_argument("--add-current-user", "-u", dest="user", parser.add_argument("--add-current-user", "-u", dest="user",
action="store_true", action="store_true",
help="Add the current user to image's passwd") help="Add the current user to image's passwd")
parser.add_argument("tag", parser.add_argument("-t", dest="tag",
help="Image Tag") help="Image Tag")
parser.add_argument("dockerfile", parser.add_argument("-f", dest="dockerfile",
help="Dockerfile name") help="Dockerfile name")
def run(self, args, argv): def run(self, args, argv):