diff options
| author | Tomas Tomecek <ttomecek@redhat.com> | 2015-11-24 19:30:50 +0100 |
|---|---|---|
| committer | Tomas Tomecek <ttomecek@redhat.com> | 2015-12-02 09:46:29 +0100 |
| commit | 2c3af6ca8e07014601e0df03ed7db401e6f204f2 (patch) | |
| tree | 912abae87cf9ebaffb696914a9cb74df82b8867d | |
| parent | 55b67acb5b4172e6fece249f111fe174dd5c6268 (diff) | |
| download | docker-py-2c3af6ca8e07014601e0df03ed7db401e6f204f2.tar.gz | |
make,integration-dind: try to remove dpy-dind
b/c if test fails, dpy-dind is left running and integration-dind target
will refuse to start and you need to manually force-remove the container
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -31,6 +31,7 @@ integration-test-py3: build-py3 docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration integration-dind: build build-py3 + docker rm -vf dpy-dind || : docker run -d --name dpy-dind --env="DOCKER_HOST=tcp://localhost:2375" --privileged dockerswarm/dind:1.9.0 docker -d -H tcp://0.0.0.0:2375 docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test tests/integration docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test tests/integration |