From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdeu8-00069R-IH for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:20:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdeu4-0006ie-GH for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:20:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54248) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdeu4-0006hl-7t for qemu-devel@nongnu.org; Tue, 14 Feb 2017 10:20:28 -0500 Date: Tue, 14 Feb 2017 23:20:25 +0800 From: Fam Zheng Message-ID: <20170214152025.GE20715@lemon.lan> References: <20170214100733.22280-1-alex.bennee@linaro.org> <20170214100733.22280-2-alex.bennee@linaro.org> <20170214142204.GA20715@lemon.lan> <87d1ekvmc7.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <87d1ekvmc7.fsf@linaro.org> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 1/3] tests/docker: add basic user mapping support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: qemu-devel@nongnu.org On Tue, 02/14 15:11, Alex Benn=E9e wrote: >=20 > Fam Zheng writes: >=20 > > On Tue, 02/14 10:07, Alex Benn=E9e wrote: > >> 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 par= t > >> of users file-system to the container. This is useful for example fo= r > >> doing cross-builds of arbitrary source trees. For this to work > >> smoothly the container needs to have a user created that maps cleanl= y > >> to the host system. > >> > >> This adds a -u option to the docker script so that: > >> > >> DEB_ARCH=3Darmhf DEB_TYPE=3Dstable ./tests/docker/docker.py build = \ > >> -u --include-executable=3Darm-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=3Dalex:alex -w /src/ debian:armhf \ > >> sh -c "make clean && ./configure -s && make" > >> > >> Alternatively specifying USER will add the appropriate stanza when > >> building via the Makefile: > >> > >> make docker-image-debian-armhf-cross USER=3D1 > >> > >> Signed-off-by: Alex Benn=E9e > >> 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 > >> --- > >> tests/docker/Makefile.include | 2 ++ > >> tests/docker/docker.py | 15 +++++++++++++-- > >> 2 files changed, 15 insertions(+), 2 deletions(-) > >> > >> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.i= nclude > >> index 3f15d5aea8..8db55e43aa 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 $(USER),--add-current-user,) \ > >> $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)),\ > >> "BUILD","$*") > >> > >> @@ -99,6 +100,7 @@ docker: > >> @echo ' (default is 1)' > >> @echo ' DEBUG=3D1 Stop and drop to shell in the cr= eated container' > >> @echo ' before running the command.' > >> + @echo ' USER=3D1 Add current user to docker image.' > > > > This is a bad choice of name, $USER is "$(id -un)", maybe > > ADD_CUR_USER? >=20 > Or we could just enable it by default? Is there a reason not to enable > the current user for these images? I think that's fine, but then docker.py needs to tolerate user already ex= isting in the image, such as when you build qemu:debian-cross-$foo on top of qemu:debian. Fam