diff options
| author | Stephen Moore <stephen@delfick.com> | 2015-09-20 15:48:07 +1000 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-10-14 17:29:31 -0700 |
| commit | 7f3692ceeda92ca3690394822cbd3c99378c0d7e (patch) | |
| tree | 14cab5bb453d57b901ed0d1dbaa8d8d4f5cdb4ed /Makefile | |
| parent | b1f25317deae569d332cf5faaccda8710932e6ef (diff) | |
| download | docker-py-7f3692ceeda92ca3690394822cbd3c99378c0d7e.tar.gz | |
Fix attach method over SSL connections
Signed-off-by: Stephen Moore <stephen@delfick.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -11,7 +11,10 @@ build: build-py3: docker build -t docker-py3 -f Dockerfile-py3 . -test: flake8 unit-test unit-test-py3 integration-dind +build-dind-certs: + docker build -t dpy-dind-certs -f tests/Dockerfile-dind-certs . + +test: flake8 unit-test unit-test-py3 integration-dind integration-dind-ssl unit-test: build docker run docker-py py.test tests/test.py tests/utils_test.py @@ -26,10 +29,17 @@ integration-test-py3: build-py3 docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration_test.py integration-dind: build build-py3 - docker run -d --name dpy-dind --privileged dockerswarm/dind:1.8.1 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_test.py - docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test tests/integration_test.py + docker run -d --name dpy-dind --env="DOCKER_HOST=tcp://localhost:2375" --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 tests/integration_test.py + docker run --volumes-from dpy-dind --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test tests/integration_test.py docker rm -vf dpy-dind +integration-dind-ssl: build-dind-certs build build-py3 + docker run -d --name dpy-dind-certs dpy-dind-certs + docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl -v /tmp --privileged dockerswarm/dind:1.8.1 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 + docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py py.test tests/integration_test.py + docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py3 py.test tests/integration_test.py + docker rm -vf dpy-dind-ssl dpy-dind-certs + flake8: build - docker run docker-py flake8 docker tests
\ No newline at end of file + docker run docker-py flake8 docker tests |