From patchwork Fri Jun 2 18:56:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 9763201 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AD2E9602BF for ; Fri, 2 Jun 2017 18:58:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FAFA285A8 for ; Fri, 2 Jun 2017 18:58:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 948F8285B0; Fri, 2 Jun 2017 18:58:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 33A35285A8 for ; Fri, 2 Jun 2017 18:58:25 +0000 (UTC) Received: from localhost ([::1]:51135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGrmC-0001wL-Aq for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Jun 2017 14:58:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGrkq-0001uK-VU for qemu-devel@nongnu.org; Fri, 02 Jun 2017 14:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGrkq-0006DH-3x for qemu-devel@nongnu.org; Fri, 02 Jun 2017 14:57:01 -0400 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]:35070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dGrkp-0006D7-VM for qemu-devel@nongnu.org; Fri, 02 Jun 2017 14:57:00 -0400 Received: by mail-oi0-x243.google.com with SMTP id f206so3398846oig.2 for ; Fri, 02 Jun 2017 11:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TPkRkwQsUSa2p4eyWH0oyYwoM73QiqUQg4o13HJezCM=; b=YzIUs59n3GJt1h1LBVVMWzu8SqbqMePZ+R2HulftCR2jZba2HJ/ugH8DYJFTlFWI35 e7pytW4OQzTh3FWOBGanNy8Jtb6tHmILwsAsQgDyCq1vnGwFhmJEHgBnZJd9MzZ91NRV j3ThWOpfwW7MBA4ruXB44iW3K4Betmj7/hiBo7y8ZQjF5+doLef4HrbMdAnAHcOT71vs PGUxjmdUJQVufFjoQdVVYSSjw/r3ELhkLnrDmRNfqbNyidlLr53xD337FiftdpmQR/Zh mkpc9nWIIliYBeswLmncZWPuOP5r9M2jvnP8mO3NQ9obFwleF8R4BnRTJdYaw0lAHrSp qkzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TPkRkwQsUSa2p4eyWH0oyYwoM73QiqUQg4o13HJezCM=; b=AYY+u676NQlC4361esIQ9+Aac+xplCRpG3f0S0etV6cVCYPyGNwLMccMUFq6r8Fdtw dqLNslJhLGh8q0oVpARXWNnqmcm03xrOpfdoUs2Uyys8jDPa9hDhOiP0EuZ2uf70dlv7 V/L57hvaazretMPEshOFQniFhIsuaIotVVTN0ZQeSO6SOe7IuUpjpNosDsKgGXUbXAuR w4ROlaFD7R39wgiajsyxMqfyGLIjx0xEsCQ5qKQQZpevQ3xigUdo+m0zZ7JRSRsZzVk5 RlzUp319NGU93Tmn+Con2ALAadeEzDHb+VtAL5iBHu3pOnSfZ7QpBjRJkrfwW1BLRH8n epjA== X-Gm-Message-State: AODbwcD8oNCAJDZk+pnfIgdlbeCwLk3RR+NQtse5p4BMBNyNl/s4Qk5S X5hY8aEW3e15nx4NwE+SHA== X-Received: by 10.202.244.86 with SMTP id s83mr5235077oih.116.1496429819021; Fri, 02 Jun 2017 11:56:59 -0700 (PDT) Received: from yoga.attlocal.net ([2602:30a:2c37:1a00::43]) by smtp.gmail.com with ESMTPSA id z2sm1345048ota.1.2017.06.02.11.56.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 11:56:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Date: Fri, 2 Jun 2017 15:56:08 -0300 Message-Id: <20170602185630.5059-3-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170602185630.5059-1-f4bug@amsat.org> References: <20170602185630.5059-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::243 Subject: [Qemu-devel] [PATCH v5 02/24] docker: add --include-files argument to 'build' command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée --- tests/docker/Makefile.include | 3 +++ tests/docker/docker.py | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 03eda37bf4..fe1a9a53ff 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -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= Include executable in image.' + @echo ' EXTRA_FILES=" [... ]"' + @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 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 6ddc6e4c2a..10fa907905 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -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()