Commit dfae6284 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 31d321c2

tests/docker/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -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))\

tests/docker/docker.py

+3 −3
Original line number Diff line number Diff line
@@ -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):