From patchwork Mon Feb 20 10:51:36 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: 94196 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1279063obz; Mon, 20 Feb 2017 02:56:06 -0800 (PST) X-Received: by 10.200.53.69 with SMTP id z5mr5173619qtb.120.1487588166922; Mon, 20 Feb 2017 02:56:06 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k30si12678325qta.168.2017.02.20.02.56.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 20 Feb 2017 02:56:06 -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]:37422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfldW-0001lb-Ia for patch@linaro.org; Mon, 20 Feb 2017 05:56:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cflZD-0006iD-HM for qemu-devel@nongnu.org; Mon, 20 Feb 2017 05:51:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cflZB-0006LN-Fh for qemu-devel@nongnu.org; Mon, 20 Feb 2017 05:51:39 -0500 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:33846) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cflZB-0006Ks-6c for qemu-devel@nongnu.org; Mon, 20 Feb 2017 05:51:37 -0500 Received: by mail-wr0-x22a.google.com with SMTP id z61so61481849wrc.1 for ; Mon, 20 Feb 2017 02:51:37 -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=ToJI48wpYt2cSHGncWIWs3TYvd4E/KCjfqEfpPY0T+I=; b=B0jC9JVIAgV20S9+0tMWYmfHQD2eYy4p3JzdAGcAfiqah+dsgZZbq5BoyfrAJK+Y/g VaWIRHsujsXABh2Rgrsqneg6ITiUYd5hE6EeuYeZxv6QknYkebnlVylrO3ivfMMElOQC SHpQ5MCx4noReYCahN0JPPkRBIDfURQQSO2h0= 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=ToJI48wpYt2cSHGncWIWs3TYvd4E/KCjfqEfpPY0T+I=; b=H3Gjyql41AJxBynwlO8XMYV6KYO9tbyA5rDwJysJwmFPprijOnQ4m1hX3PiTVssIxI h2N4gTgFjHIPnkQ0rudVoIRaalmZVSx7kSahf3MywWlPof2qW/UfKWgVBVyov2ldN1LX U7suLiI+if9msHR4mpzM8o5PWrHjlrIZ5tVcei31/VyLe9vZ3xsPjoQrrtQA3z6KkAda GboUTDri2qQwPMyJzvdBqSRrDV2Z0ct9y2B5NhBzTCX42xvb4bsSftqVuiecXPD55wuu 9kKAtk9N965GLu9aBVUmkshD/lu2dCDkhvNiC2Wman8yWh0iy8basIjrG24uQSXzo4mP 60mw== X-Gm-Message-State: AMke39lKeyEnTE/uwG9sKx/SSgCtFT15ZBptNCuRFbY28e/m15QzakZY9vgA7cnYL1ox0Jid X-Received: by 10.223.167.138 with SMTP id j10mr12437219wrc.178.1487587896012; Mon, 20 Feb 2017 02:51:36 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d75sm8825741wmd.25.2017.02.20.02.51.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 02:51:34 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EC1BB3E014D; Mon, 20 Feb 2017 10:51:39 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Mon, 20 Feb 2017 10:51:36 +0000 Message-Id: <20170220105139.21581-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170220105139.21581-1-alex.bennee@linaro.org> References: <20170220105139.21581-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:c0c::22a Subject: [Qemu-devel] [PATCH v5 1/4] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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" All docker containers built will add the current user unless explicitly disabled by specifying NOUSER when invoking the Makefile: make docker-image-debian-armhf-cross NOUSER=1 Signed-off-by: Alex Bennée Reviewed-by: Fam Zheng Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé --- v2 - write the useradd directly - change long option to --add-current-user v3 - images -> image's - add r-b - add USER to Makefile v4 - s/USER/NOUSER/ and default to on - fix the add-user code to skip if user already setup (for chained images) v5 - fix whitespace damage in Makefile - hide error messages from id when adding user - minor re-phrasing of NOUSER line --- tests/docker/Makefile.include | 2 ++ tests/docker/docker.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) -- 2.11.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3f15d5aea8..3b5ffecb04 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -50,6 +50,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") @@ -99,6 +100,7 @@ docker: @echo ' (default is 1)' @echo ' DEBUG=1 Stop and drop to shell in the created container' @echo ' before running the command.' + @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.' diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 37d83199e7..9fd32ab5fa 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,21 @@ 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 id %s 2>/dev/null || useradd -u %d -U %s" % + (uname, uid, uname)) + tmp_df.write("\n") tmp_df.write("LABEL com.qemu.dockerfile-checksum=%s" % _text_checksum(dockerfile)) @@ -225,6 +234,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 image's passwd") parser.add_argument("tag", help="Image Tag") parser.add_argument("dockerfile", @@ -261,7 +273,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)