From nobody Tue Feb 10 19:48:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495902020529211.42562770015604; Sat, 27 May 2017 09:20:20 -0700 (PDT) Received: from localhost ([::1]:41345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeRu-0007UO-UY for importer@patchew.org; Sat, 27 May 2017 12:20:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEeQ6-0006Bb-4B for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEeQ5-0005eB-1Z for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:26 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:33915) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dEeQ4-0005dd-SJ for qemu-devel@nongnu.org; Sat, 27 May 2017 12:18:24 -0400 Received: by mail-oi0-x242.google.com with SMTP id w10so6038405oif.1 for ; Sat, 27 May 2017 09:18:24 -0700 (PDT) Received: from yoga.attlocal.net (162-231-236-127.lightspeed.miamfl.sbcglobal.net. [162.231.236.127]) by smtp.gmail.com with ESMTPSA id i32sm1953113otd.43.2017.05.27.09.18.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 May 2017 09:18:23 -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=YO3xF638ywfX4eqTFbnh77WREQoH5UtLzR/zOsWWLe8=; b=uabMS+qpeOlQyvAt0svJUI3ArHeWgR+kJ1NNIEkXX48RVUP4B2ycdhRT+VgvzY28uR YsHjSWONtDcEdWi8PLur6di4PxmKgbXgW6h/bvG0I3qUjzsc8I1oU4iK5hohOafmy0S1 sCXNEYk32cuKnDrhqkZ3nNeGVLDe7l9hyDUNvlF1LGxDoXkYRdwBXn7xv1+WElVl9V3m /cK3qyfuMQRn1tTQjjzHhuBg7ckGoI4wqbBGGlRe/aUN3ts0WU3trYe4LIkm7wR4QAnU /zhVg6XU2phFf55gwyV3rZ9akWNh2P9HkA/g3fvjWDl7+8yHh2De8AN0L9/kjrLBPcH0 9e7Q== 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=YO3xF638ywfX4eqTFbnh77WREQoH5UtLzR/zOsWWLe8=; b=n9QljntzFTyb5+uRz7pQ546ZzlaeMge3AEC7UnM4AS4hHSrh1PW0kgNbuE5FcpGLZB 7xia+aAdSFXq20h0zaMLMxeinzKIjOAUtlrbRFT5/OqzZumu0tLz1+3rRyBQWjFfvBfi XYWWm1DwU6sJh5gFwFxvWupyso53V1kd6Z2ma4DDRE7ybukhhIUPomoa/uFLibZnDccy h9nOOCCpf9XqSzY0RISbqVecxCOwEXzQrVuArqbtsMPmm33YWm/zQvmxTfLJOGGm4+zz p8GEor8Tk2I5ulF9Vjtf85VyuvHlx9Y0CoTbPtB72S3gtD0Asy944FdMt0ezlutC2uHx mG+g== X-Gm-Message-State: AODbwcA0B2D7Iyiuy5IhKA/RBpLPsTv9gmV00Xf1VRzG9eOOL4iDnO8a h6ZPI2T4n4h8Te95TnE= X-Received: by 10.202.50.213 with SMTP id y204mr3761847oiy.164.1495901904069; Sat, 27 May 2017 09:18:24 -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: Sat, 27 May 2017 13:17:33 -0300 Message-Id: <20170527161755.7761-3-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170527161755.7761-1-f4bug@amsat.org> References: <20170527161755.7761-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::242 Subject: [Qemu-devel] [PATCH v4 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 3 +++ tests/docker/docker.py | 11 ++++++++--- 2 files changed, 11 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=3D$(EXECUTABLE)),\ "BUILD","$*") =20 @@ -107,6 +108,8 @@ docker: @echo ' NOUSER Define to disable adding current user to = containers passwd.' @echo ' NOCACHE=3D1 Ignore cache when build images.' @echo ' EXECUTABLE=3D Include executable in image.' + @echo ' EXTRA_FILES=3D" [... ]"' + @echo ' Include extra files in image.' =20 # 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..5401e58fce 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -237,6 +237,10 @@ class BuildCommand(SubCommand): help=3D"""Specify a binary that will be copied= to the container together with all its dependent libraries""") + parser.add_argument("--extra-files", "-f", nargs=3D'*', + help=3D"""Specify files that will be copied in= the + Docker image, fulfilling the ADD directive fro= m the + Dockerfile""") parser.add_argument("--add-current-user", "-u", dest=3D"user", action=3D"store_true", help=3D"Add the current user to image's passwd= ") @@ -270,10 +274,11 @@ class BuildCommand(SubCommand): print "%s exited with code %d" % (docker_pre, rc) return 1 =20 - # Do we include a extra binary? + # Include files used by ADD directives found within the Docker= file. 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) =20 argv +=3D ["--build-arg=3D" + k.lower() + "=3D" + v for k, v in os.environ.iteritems() --=20 2.11.0