diff options
| author | Paolo Bonzini | 2020-04-22 16:17:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-06-10 18:09:31 +0200 |
| commit | dfae62845961556935c6b8ccbb4285d4688c42b4 (patch) | |
| tree | 7d0f19a3b3fcf5a6dd63ae507fa1021c6ad44542 /tests/docker/Makefile.include | |
| parent | Merge remote-tracking branch 'remotes/philmd-gitlab/tags/sparc-next-20200609'... (diff) | |
| download | qemu-dfae62845961556935c6b8ccbb4285d4688c42b4.tar.gz qemu-dfae62845961556935c6b8ccbb4285d4688c42b4.tar.xz qemu-dfae62845961556935c6b8ccbb4285d4688c42b4.zip | |
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/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ed46bd98eb..f32a95b488 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))\ |