File tree Expand file tree Collapse file tree 2 files changed +8
-20
lines changed Expand file tree Collapse file tree 2 files changed +8
-20
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,9 @@ HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp
4
4
5
5
all : test
6
6
7
+ clean :
8
+ docker rm -vf dpy-dind
9
+
7
10
build :
8
11
docker build -t docker-py .
9
12
@@ -24,6 +27,9 @@ integration-test: build
24
27
integration-test-py3 : build-py3
25
28
docker run -v ` $( HOST_TMPDIR) ` :/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test -rxs tests/integration_test.py
26
29
27
- integration-ci :
30
+ integration-dind : build build-py3
28
31
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
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments