Alex Bennée <[email protected]> writes: > Hi, > > This is v5 of the series (Fam posted the last revision). I've dropped > all the fancy chroot-in-docker stuff in favour of making the > debootstrap.pre script more platform agnostic. If it can't find > debootstrap on the system it just clones the upstream SCM and uses the > script from there. > > There is a patch pending in Debian to remove one minor niggle that > stops that working at the moment, see: > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830869 > > The pre script also does a bunch of additional checking of the > pre-requisites including if binfmt_misc is setup for qemu-$ARCH. It > doesn't go quite as far as checking the setup path though but it > should be sufficient. > > The only remaining problem is how to handle the flexibility of > multiple architectures in the Make system. As the dockerfiles live in > the tests/docker/dockerfile directory all the normal docker test > constructions work. However if you want a cross-arch docker image you > need to build it "by hand" with the appropriate DEB_ARCH/DEB_TYPE and > --include-executable stanza. > > So any ideas about that?
Any thoughts on that Fam? Can we merge it without the final step on the grounds it makes for useful testing? > > Alex Bennée (5): > tests/docker/docker.py: docker_dir outside build > tests/docker/docker.py: support --include-executable > tests/docker/docker.py: check and run .pre script > tests/docker/dockerfiles: new debian-bootstrap.docker > tests/docker/docker.py: add update operation > > Fam Zheng (2): > docker: More sensible run script > docker: Fix exit code if $CMD failed > > tests/docker/Makefile.include | 4 +- > tests/docker/docker.py | 144 > +++++++++++++++++++++-- > tests/docker/dockerfiles/debian-bootstrap.docker | 21 ++++ > tests/docker/dockerfiles/debian-bootstrap.pre | 82 +++++++++++++ > tests/docker/run | 16 ++- > 5 files changed, 252 insertions(+), 15 deletions(-) > create mode 100644 tests/docker/dockerfiles/debian-bootstrap.docker > create mode 100755 tests/docker/dockerfiles/debian-bootstrap.pre -- Alex Bennée
