tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8135 from aiordache/test_auth

Browse Source 
Fix docker/config path in the test containers
This commit is contained in:
Anca Iordache 2021-02-18 19:36:21 +01:00 committed by GitHub
commit 66375c2871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -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}" \\

2
Release.Jenkinsfile
View File

@ -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}" \\

2
script/test/all
View File

@ -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 \