Skip to content

Commit fa3082b

Browse files
committed
Update integration-dind task
1 parent abaf346 commit fa3082b

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
44

55
all: test
66

7+
clean:
8+
docker rm -vf dpy-dind
9+
710
build:
811
docker build -t docker-py .
912

@@ -24,6 +27,9 @@ integration-test: build
2427
integration-test-py3: build-py3
2528
docker run -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test -rxs tests/integration_test.py
2629

27-
integration-ci:
30+
integration-dind: build build-py3
2831
docker build -t dpy-tests -f ./tests/Dockerfile .
29-
docker run --privileged -t dpy-tests
32+
docker run -d --name dpy-dind -v /tmp --privileged dockerswarm/dind:1.8.1 docker -d -H tcp://0.0.0.0:2375
33+
docker run --volumes-from dpy-dind --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test -rxs tests/integration_test.py
34+
docker run --volumes-from dpy-dind --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test -rxs tests/integration_test.py
35+
docker rm -vf dpy-dind

tests/Dockerfile

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)