v6: A few tweaks to make this more mergable. Including:
- Add and catch magic pre script exit code "3" to allow skipping image.
- Tweak debian-bootstrap.pre to return '3' when appropriate (It should
still return 1 for debootstrap command failure).
- Fix "realpath" to "readlink -e" to be compatible with centos6.
- Add the last patch to skip test if the image is skipped by .pre.
Alex, if this looks good to you, I can send a pull req today.
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 (3):
docker: More sensible run script
docker: Fix exit code if $CMD failed
docker: Don't start a container that doesn't exist
tests/docker/Makefile.include | 9 +-
tests/docker/docker.py | 150 +++++++++++++++++++++--
tests/docker/dockerfiles/debian-bootstrap.docker | 21 ++++
tests/docker/dockerfiles/debian-bootstrap.pre | 87 +++++++++++++
tests/docker/run | 16 ++-
5 files changed, 267 insertions(+), 16 deletions(-)
create mode 100644 tests/docker/dockerfiles/debian-bootstrap.docker
create mode 100755 tests/docker/dockerfiles/debian-bootstrap.pre
--
2.7.4
