mirror of
https://github.com/docker/compose.git
synced 2025-07-23 13:45:00 +02:00
Merge pull request #8135 from aiordache/test_auth
Fix docker/config path in the test containers
This commit is contained in:
commit
66375c2871
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -99,7 +99,7 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
|
|||||||
--privileged \\
|
--privileged \\
|
||||||
--volume="\$(pwd)/.git:/code/.git" \\
|
--volume="\$(pwd)/.git:/code/.git" \\
|
||||||
--volume="/var/run/docker.sock:/var/run/docker.sock" \\
|
--volume="/var/run/docker.sock:/var/run/docker.sock" \\
|
||||||
--volume="\${DOCKER_CONFIG}/config.json:/code/.docker/config.json" \\
|
--volume="\${DOCKER_CONFIG}/config.json:/root/.docker/config.json" \\
|
||||||
-e "DOCKER_TLS_CERTDIR=" \\
|
-e "DOCKER_TLS_CERTDIR=" \\
|
||||||
-e "TAG=${imageName}" \\
|
-e "TAG=${imageName}" \\
|
||||||
-e "STORAGE_DRIVER=${storageDriver}" \\
|
-e "STORAGE_DRIVER=${storageDriver}" \\
|
||||||
|
@ -259,7 +259,7 @@ def runTests(dockerVersion, pythonVersion, baseImage) {
|
|||||||
--privileged \\
|
--privileged \\
|
||||||
--volume="\$(pwd)/.git:/code/.git" \\
|
--volume="\$(pwd)/.git:/code/.git" \\
|
||||||
--volume="/var/run/docker.sock:/var/run/docker.sock" \\
|
--volume="/var/run/docker.sock:/var/run/docker.sock" \\
|
||||||
--volume="\${DOCKER_CONFIG}/config.json:/code/.docker/config.json" \\
|
--volume="\${DOCKER_CONFIG}/config.json:/root/.docker/config.json" \\
|
||||||
-e "DOCKER_TLS_CERTDIR=" \\
|
-e "DOCKER_TLS_CERTDIR=" \\
|
||||||
-e "TAG=${imageName}" \\
|
-e "TAG=${imageName}" \\
|
||||||
-e "STORAGE_DRIVER=${storageDriver}" \\
|
-e "STORAGE_DRIVER=${storageDriver}" \\
|
||||||
|
@ -43,7 +43,7 @@ for version in $DOCKER_VERSIONS; do
|
|||||||
--name "$daemon_container" \
|
--name "$daemon_container" \
|
||||||
--privileged \
|
--privileged \
|
||||||
--volume="/var/lib/docker" \
|
--volume="/var/lib/docker" \
|
||||||
-v $DOCKER_CONFIG/config.json:/code/.docker/config.json \
|
-v $DOCKER_CONFIG/config.json:/root/.docker/config.json \
|
||||||
-e "DOCKER_TLS_CERTDIR=" \
|
-e "DOCKER_TLS_CERTDIR=" \
|
||||||
"docker:$version-dind" \
|
"docker:$version-dind" \
|
||||||
dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
|
dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user