diff options
| author | Joffrey F <joffrey@docker.com> | 2017-01-25 16:31:43 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2017-01-25 16:52:26 -0800 |
| commit | a1d550a14c188dd9ce30d6344e35c5e48ad8f75d (patch) | |
| tree | 60a433e24cbd7a92cac8d2074c7d621560c8aea2 /Makefile | |
| parent | 4ff77dc1c910e07117c925cf0f9784529f3bd8d5 (diff) | |
| download | docker-py-config_test_api_version.tar.gz | |
Allow configuring API version for integration test with env varconfig_test_api_version
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -46,10 +46,10 @@ integration-dind: build build-py3 docker rm -vf dpy-dind || : docker run -d --name dpy-dind --privileged dockerswarm/dind:1.13.0 docker daemon\ -H tcp://0.0.0.0:2375 - docker run --rm --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-sdk-python\ - py.test tests/integration - docker run --rm --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-sdk-python3\ - py.test tests/integration + docker run --rm --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TEST_API_VERSION=1.25"\ + --link=dpy-dind:docker docker-sdk-python py.test tests/integration + docker run --rm --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TEST_API_VERSION=1.25"\ + --link=dpy-dind:docker docker-sdk-python3 py.test tests/integration docker rm -vf dpy-dind .PHONY: integration-dind-ssl @@ -61,10 +61,10 @@ integration-dind-ssl: build-dind-certs build build-py3 --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem\ --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 docker run --rm --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\ - --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs"\ + --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --env="DOCKER_TEST_API_VERSION=1.25"\ --link=dpy-dind-ssl:docker docker-sdk-python py.test tests/integration docker run --rm --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375"\ - --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs"\ + --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --env="DOCKER_TEST_API_VERSION=1.25"\ --link=dpy-dind-ssl:docker docker-sdk-python3 py.test tests/integration docker rm -vf dpy-dind-ssl dpy-dind-certs |