mirror of https://github.com/docker/docker-py.git
Use DOCKER_CONFIG to have creds in dind environment
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
This commit is contained in:
parent
407dcfd65b
commit
6de6936f5d
|
|
@ -95,7 +95,7 @@ def runTests = { Map settings ->
|
||||||
-e 'DOCKER_TEST_API_VERSION=${apiVersion}' \\
|
-e 'DOCKER_TEST_API_VERSION=${apiVersion}' \\
|
||||||
--network ${testNetwork} \\
|
--network ${testNetwork} \\
|
||||||
--volumes-from ${dindContainerName} \\
|
--volumes-from ${dindContainerName} \\
|
||||||
-v ~/.docker/config.json:/root/.docker/config.json \\
|
-v $DOCKER_CONFIG/config.json:/root/.docker/config.json \\
|
||||||
${testImage} \\
|
${testImage} \\
|
||||||
py.test -v -rxs --cov=docker --ignore=tests/ssh tests/
|
py.test -v -rxs --cov=docker --ignore=tests/ssh tests/
|
||||||
"""
|
"""
|
||||||
|
|
@ -111,7 +111,7 @@ def runTests = { Map settings ->
|
||||||
-e 'DOCKER_TEST_API_VERSION=${apiVersion}' \\
|
-e 'DOCKER_TEST_API_VERSION=${apiVersion}' \\
|
||||||
--network ${testNetwork} \\
|
--network ${testNetwork} \\
|
||||||
--volumes-from ${dindContainerName} \\
|
--volumes-from ${dindContainerName} \\
|
||||||
-v ~/.docker/config.json:/root/.docker/config.json \\
|
-v $DOCKER_CONFIG/config.json:/root/.docker/config.json \\
|
||||||
${testImage} \\
|
${testImage} \\
|
||||||
py.test -v -rxs --cov=docker tests/ssh
|
py.test -v -rxs --cov=docker tests/ssh
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue