Fam Zheng <[email protected]> writes: > On Mon, 07/18 16:57, Alex Bennée wrote: >> > So any ideas about that? > > Hi Alex, > > Sorry for the late reply. > >> >> Any thoughts on that Fam? Can we merge it without the final step on the >> grounds it makes for useful testing? > > Yes, we can, though I'd like to make sure we don't break existing docker > tests. > Specifically we need to skip building and spawning the debian-bootstrap image > if its dependencies are not met. To do that we can define a magic exit code > for > .pre scripts, and catch it in docker.py.
It does exit if the pre-reqs aren't met, I guess we could default the DEB_ARCH/DEB_TYPE as well. > > What do you think? > > Fam > >> >> > >> > 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 >> -- Alex Bennée
