diff options
| author | Joffrey F <joffrey@docker.com> | 2015-09-09 10:46:06 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-09-09 14:49:58 -0700 |
| commit | fa3082b6cd46cd486bb38ca4e266ff489f6dff94 (patch) | |
| tree | bbc1e1d7d446e3640b3543eb8c5a3d1b1936e3b2 | |
| parent | abaf346b49277004399bf7308de28e2ee012739c (diff) | |
| download | docker-py-756-containerized-integration.tar.gz | |
Update integration-dind task756-containerized-integration
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | tests/Dockerfile | 18 |
2 files changed, 8 insertions, 20 deletions
@@ -4,6 +4,9 @@ HOST_TMPDIR=test -n "$(TMPDIR)" && echo $(TMPDIR) || echo /tmp all: test +clean: + docker rm -vf dpy-dind + build: docker build -t docker-py . @@ -24,6 +27,9 @@ integration-test: build integration-test-py3: build-py3 docker run -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test -rxs tests/integration_test.py -integration-ci: +integration-dind: build build-py3 docker build -t dpy-tests -f ./tests/Dockerfile . - docker run --privileged -t dpy-tests + docker run -d --name dpy-dind -v /tmp --privileged dockerswarm/dind:1.8.1 docker -d -H tcp://0.0.0.0:2375 + 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 + 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 + docker rm -vf dpy-dind diff --git a/tests/Dockerfile b/tests/Dockerfile deleted file mode 100644 index 576af4a..0000000 --- a/tests/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM dockerswarm/dind:1.8.1 -MAINTAINER Joffrey F <joffrey@docker.com> - -RUN mkdir /home/docker-py -WORKDIR /home/docker-py - -RUN apt-get update && apt-get install -y python python-setuptools && easy_install pip - -ADD requirements.txt /home/docker-py/requirements.txt -RUN pip install -r requirements.txt - -ADD test-requirements.txt /home/docker-py/test-requirements.txt -RUN pip install -r test-requirements.txt - -ADD . /home/docker-py -RUN pip install -U . - -CMD ["bash", "-c", "docker daemon 2>/dev/null & py.test -rxs tests/integration_test.py"]
\ No newline at end of file |