From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBzSK-0002iF-V2 for qemu-devel@nongnu.org; Sun, 12 Jun 2016 03:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bBzSF-0008Nj-BE for qemu-devel@nongnu.org; Sun, 12 Jun 2016 03:05:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bBzSF-0008MQ-3M for qemu-devel@nongnu.org; Sun, 12 Jun 2016 03:05:07 -0400 Date: Sun, 12 Jun 2016 15:05:00 +0800 From: Fam Zheng Message-ID: <20160612070500.GN27167@ad.usersys.redhat.com> References: <1465403752-30348-1-git-send-email-alex.bennee@linaro.org> <1465403752-30348-4-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1465403752-30348-4-git-send-email-alex.bennee@linaro.org> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 3/3] add debian-bootstrap.docker target (and pre script) 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, riku.voipio@linaro.org On Wed, 06/08 17:35, Alex Benn=E9e wrote: > Together with the debian-bootstrap.pre script can now build an arbitrar= y > architecture of Debian using debootstrap. The docker script will now > search for an associated $dockerfile.pre script which gets run in the > same build context as the dockerfile will be. This allows debootstrap t= o > set up its first stage before the container is built. >=20 > To build a container you need a command line like: >=20 > DEB_ARCH=3Darmhf DEB_TYPE=3Dtesting \ > ./tests/docker/docker.py build \ > --include-executable=3Darm-linux-user/qemu-arm debian:armhf \ > ./tests/docker/dockerfiles/debian-bootstrap.docker >=20 > Signed-off-by: Alex Benn=E9e >=20 > --- > v2 > - use .pre script instead of embedded HOST_CMD > - make default image include all QEMU build-deps > --- > tests/docker/docker.py | 5 +++++ Could you split the docker.py into a separate patch? > tests/docker/dockerfiles/debian-bootstrap.docker | 21 ++++++++++++++++= +++++ > tests/docker/dockerfiles/debian-bootstrap.pre | 5 +++++ > 3 files changed, 31 insertions(+) > create mode 100644 tests/docker/dockerfiles/debian-bootstrap.docker > create mode 100755 tests/docker/dockerfiles/debian-bootstrap.pre >=20 > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index ed6fa45..43041eb 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -205,6 +205,11 @@ class BuildCommand(SubCommand): > # Create a docker context directory for the build > docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") > =20 > + # Is there a .pre file to run in the build context? > + docker_pre =3D os.path.splitext(args.dockerfile)[0]+".pre" > + if os.path.exists(docker_pre): > + subprocess.call(os.path.realpath(docker_pre), cwd=3Ddo= cker_dir) We should probably abort here if exit code is non-zero. Use subprocess.check_call? Fam > + > # Do we include a extra binary? > if args.include_executable: > _copy_binary_with_libs(args.include_executable, > diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/d= ocker/dockerfiles/debian-bootstrap.docker > new file mode 100644 > index 0000000..3a9125e > --- /dev/null > +++ b/tests/docker/dockerfiles/debian-bootstrap.docker > @@ -0,0 +1,21 @@ > +# Create Debian Bootstrap Image > +# > +# This is intended to be pre-poluated by: > +# - a first stage debootstrap (see debian-bootstrap.pre) > +# - a native qemu-$arch that binfmt_misc will run > +FROM scratch > + > +# Add everything from the context into the container > +ADD . / > + > +# Patch all mounts as docker already has stuff set up > +RUN sed -i 's/in_target mount/echo not for docker in_target mount/g' /= debootstrap/functions > + > +# Run stage 2 > +RUN /debootstrap/debootstrap --second-stage > + > +# At this point we can install additional packages if we want > +# Duplicate deb line as deb-src > +RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sourc= es.list > +RUN apt-get update > +RUN apt-get -y build-dep qemu > diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/dock= er/dockerfiles/debian-bootstrap.pre > new file mode 100755 > index 0000000..6f42da6 > --- /dev/null > +++ b/tests/docker/dockerfiles/debian-bootstrap.pre > @@ -0,0 +1,5 @@ > +#!/bin/sh > +# > +# Simple wrapper for debootstrap, run in the docker build context > +# > +fakeroot debootstrap --variant=3Dbuildd --foreign --arch=3D$DEB_ARCH $= DEB_TYPE . http://httpredir.debian.org/debian > --=20 > 2.7.4 >=20