From patchwork Thu Feb 16 12:34:53 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: 94062 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp2484763qgi; Thu, 16 Feb 2017 04:37:59 -0800 (PST) X-Received: by 10.200.53.247 with SMTP id l52mr1769755qtb.144.1487248679121; Thu, 16 Feb 2017 04:37:59 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b29si5129889qta.263.2017.02.16.04.37.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 16 Feb 2017 04:37:59 -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]:46153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceLJu-0001Tu-LH for patch@linaro.org; Thu, 16 Feb 2017 07:37:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceLH4-0007pQ-Uu for qemu-devel@nongnu.org; Thu, 16 Feb 2017 07:35:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceLH0-0001D7-0G for qemu-devel@nongnu.org; Thu, 16 Feb 2017 07:35:02 -0500 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:36923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ceLGz-0001Cn-Ml for qemu-devel@nongnu.org; Thu, 16 Feb 2017 07:34:57 -0500 Received: by mail-wm0-x235.google.com with SMTP id v77so14048873wmv.0 for ; Thu, 16 Feb 2017 04:34:57 -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=JcQcMUa+drUOOG/H8FQRbVp4yFgLpbqc4W1ETAVrLFE=; b=MOJSZoCZD1FwSGXV+x/sDJFeZdOs0fb1zwA/S/34rExEFoszb5e09n0qc96ScEX6G1 D8rjldQHmXMUd2Ew7D4IhyA55+0NoAt7YCwpQyr58v1UUz56ebqazvplx/Zr9O4EsYUw bxoz4CXHpKE7Xuz7OGj8BpPynZsxXie4fW9m8= 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=JcQcMUa+drUOOG/H8FQRbVp4yFgLpbqc4W1ETAVrLFE=; b=rpfQsGf1fW6WZmvuxieA5rOAJVnYHFzM6qMP5ZKB+XQMq5OVaa2LIug0rzZSbLxsoq nKXuP8nk7zNCv2jANR2d3nKdsjK7yyzv41bSLNUqVvajjmurKLi4hl/fquxuLoWlG5Yr qQXIke2zFwFz2X4IALOVSW5M5Zc1KT65J36P6+1lwuDpLhR9HK0pmI72T2Tt2yix6iOM 6SKltOkjdSuaO6BnaMFu6j8biDmMlEXQnjDgw5tqNxexZFj6uE6upTpU2Ri0PLG+k3p7 hfbqjXL/0aTyPPlN+cJ4fgq6bjsVGRETOb7tdJ45LGi78Pc97ZAXD2QxKlXNGuLMMy3c oN+w== X-Gm-Message-State: AMke39n3BJfWVeZSXWN1a0mTEUo5pCWPFjTMTYkbPN8uG3m/K1f2Ty35s5qflP5d7qBcq81u X-Received: by 10.28.5.72 with SMTP id 69mr2182433wmf.6.1487248496479; Thu, 16 Feb 2017 04:34:56 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 198sm75887wmn.11.2017.02.16.04.34.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 04:34:55 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 695AD3E0321; Thu, 16 Feb 2017 12:34:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Thu, 16 Feb 2017 12:34:53 +0000 Message-Id: <20170216123456.28621-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170216123456.28621-1-alex.bennee@linaro.org> References: <20170216123456.28621-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::235 Subject: [Qemu-devel] [PATCH v4 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 --- 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) --- tests/docker/Makefile.include | 2 ++ tests/docker/docker.py | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) -- 2.11.0 Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3f15d5aea8..4778b27ca8 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=1 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..d277a2268f 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 || 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)