diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-04-22 10:17:08 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-06-10 12:09:31 -0400 |
| commit | dfae62845961556935c6b8ccbb4285d4688c42b4 (patch) | |
| tree | 7d0f19a3b3fcf5a6dd63ae507fa1021c6ad44542 /tests/docker | |
| parent | 31d321c2b3574dcc74e9f6411af06bca6b5d10f4 (diff) | |
| download | qemu-dfae62845961556935c6b8ccbb4285d4688c42b4.zip qemu-dfae62845961556935c6b8ccbb4285d4688c42b4.tar.gz qemu-dfae62845961556935c6b8ccbb4285d4688c42b4.tar.bz2 | |
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>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/Makefile.include | 2 | ||||
| -rwxr-xr-x | tests/docker/docker.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ed46bd9..f32a95b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -55,7 +55,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker else docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ - $(DOCKER_SCRIPT) build qemu:$* $< \ + $(DOCKER_SCRIPT) build -t qemu:$* -f $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 5a9735d..d96ccc9 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -392,16 +392,16 @@ 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='*', + parser.add_argument("--extra-files", 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") - parser.add_argument("tag", + parser.add_argument("-t", dest="tag", help="Image Tag") - parser.add_argument("dockerfile", + parser.add_argument("-f", dest="dockerfile", help="Dockerfile name") def run(self, args, argv): |