From patchwork Tue Jan 24 14:33:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 92361 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1742196qgi; Tue, 24 Jan 2017 06:36:05 -0800 (PST) X-Received: by 10.200.47.53 with SMTP id j50mr28402619qta.273.1485268565506; Tue, 24 Jan 2017 06:36:05 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y36si13278730qty.52.2017.01.24.06.36.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jan 2017 06:36:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2CZ-0005UP-3r for patch@linaro.org; Tue, 24 Jan 2017 09:36:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW2AV-0004Wk-4n for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW2AT-0005KX-Bi for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:55 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:38750) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cW2AT-0005Ju-5I for qemu-devel@nongnu.org; Tue, 24 Jan 2017 09:33:53 -0500 Received: by mail-wm0-x231.google.com with SMTP id r144so212044459wme.1 for ; Tue, 24 Jan 2017 06:33:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/31ErjBMLUr0AjFulCdIlAOPy57M8+zDHyLUAWxaYJ8=; b=dViqyxb5oWC2mA8ron5v3gz+NGw4JyFBCNLqannIxbDRyKpvlJZ7L83imiHZaRw2Em b/oLk1LSAG57WZYer3ft3sQPyTguAFko5+yOn+4iDmuGyaPVagUTIfP2tG5TioXHMtRa FaxFeVItNK9mzKeBdsi0PwGG7WcxRgd9ZOupk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/31ErjBMLUr0AjFulCdIlAOPy57M8+zDHyLUAWxaYJ8=; b=If7IJu3RykNMBW8DyQdO1wvZz64pARHpOmq+4VlbRiI58+bM2QHo17pSPhviIPkt9t igWqGEdjfhMUOetnwEzovto4S8laiBXfaMGqBHm0vAadifrddFPyv0RclIid4Mc/ceJ+ JRYoOhKCSmXKy6FNRQoR1q8uZfnvpI5kayCuyOEvKm4o17K5VWHypJAw5jR5c6VWEaCf fC5nmlyVqx+bBkf/rjKBnZ3gzsszLPzuK6yL6xwsVeMnEQHNrvjKfYADAMSgmVppT7Sx 9wjrG2tCt4pMMxGvOxfPc/WVmbkX8JJtqbiN9U780LZAc1cmf+mVgmXe6nH6YtJKTJMw 5Tpg== X-Gm-Message-State: AIkVDXKOgZdqr2LS/m9FKCEgey6m08HmrrmtOWedPgN32uAjyxLUo9CKb+mF1vUIUX57Z0qh X-Received: by 10.28.27.14 with SMTP id b14mr17286544wmb.82.1485268430346; Tue, 24 Jan 2017 06:33:50 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u47sm20285902wrb.15.2017.01.24.06.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 06:33:48 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E2B7C3E2A58; Tue, 24 Jan 2017 14:33:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 24 Jan 2017 14:33:43 +0000 Message-Id: <20170124143346.22240-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170124143346.22240-1-alex.bennee@linaro.org> References: <20170124143346.22240-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH v2 4/7] tests/docker: add basic user mapping support 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:All patches CC here" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently all docker builds are done by exporting a tarball to the docker container and running the build as the containers root user. Other use cases are possible however and it is possible to map a part of users file-system to the container. This is useful for example for doing cross-builds of arbitrary source trees. For this to work smoothly the container needs to have a user created that maps cleanly to the host system. This adds a -u option to the docker script so that: DEB_ARCH=armhf DEB_TYPE=stable ./tests/docker/docker.py build \ -u --include-executable=arm-linux-user/qemu-arm \ debian:armhf ./tests/docker/dockerfiles/debian-bootstrap.docker Will build a container that can then be run like: docker run --rm -it -v /home/alex/lsrc/qemu/risu.git/:/src \ --user=alex:alex -w /src/ debian:armhf \ sh -c "make clean && ./configure -s && make" Signed-off-by: Alex Bennée --- v2 - write the useradd directly - change long option to --add-current-user --- tests/docker/docker.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.11.0 Reviewed-by: Fam Zheng diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 37d83199e7..b85739a9e2 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -25,6 +25,7 @@ import signal from tarfile import TarFile, TarInfo from StringIO import StringIO from shutil import copy, rmtree +from pwd import getpwuid DEVNULL = open(os.devnull, 'wb') @@ -149,13 +150,20 @@ class Docker(object): labels = json.loads(resp)[0]["Config"].get("Labels", {}) return labels.get("com.qemu.dockerfile-checksum", "") - def build_image(self, tag, docker_dir, dockerfile, quiet=True, argv=None): + def build_image(self, tag, docker_dir, dockerfile, + quiet=True, user=False, argv=None): if argv == None: argv = [] tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") tmp_df.write(dockerfile) + if user: + uid = os.getuid() + uname = getpwuid(uid).pw_name + tmp_df.write("\n") + tmp_df.write("RUN useradd -u %d -U %s" % (uid, uname)) + tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % _text_checksum(dockerfile)) @@ -225,6 +233,9 @@ class BuildCommand(SubCommand): help="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--add-current-user", "-u", dest="user", + action="store_true", + help="Add the current user to images passwd") parser.add_argument("tag", help="Image Tag") parser.add_argument("dockerfile", @@ -261,7 +272,7 @@ class BuildCommand(SubCommand): docker_dir) dkr.build_image(tag, docker_dir, dockerfile, - quiet=args.quiet, argv=argv) + quiet=args.quiet, user=args.user, argv=argv) rmtree(docker_dir)