diff options
| author | Joffrey F <joffrey@docker.com> | 2016-03-17 16:22:42 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-03-17 16:22:42 -0700 |
| commit | 47238e57f6e27274d5a51e8b2f9a55536dc73840 (patch) | |
| tree | c86128fcff7c9edac46a4e2ca30bab168fcad53c | |
| parent | 41acd70fd46f0d50516c78843ca739421cb450e4 (diff) | |
| download | docker-py-fix-integration-ssl-tests.tar.gz | |
Wait for dind container to be ready to accept inbound connectionsfix-integration-ssl-tests
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -40,6 +40,7 @@ integration-dind: build build-py3 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.10.3 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 + sleep 1 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 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 docker rm -vf dpy-dind-ssl dpy-dind-certs |