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

Merge pull request #8281 from aiordache/Jenkins_update

Browse Source 
Update node spec in Jenkinsfile and Docker config mount
This commit is contained in:
Ulysses Souza 2021-04-15 10:03:45 -03:00 committed by GitHub
commit 853efbfb54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -87,7 +87,7 @@ def buildImage(baseImage) {
def runTests(dockerVersion, pythonVersion, baseImage) { def runTests(dockerVersion, pythonVersion, baseImage) {
return { return {
stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") { stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") {
node("ubuntu && amd64 && !zfs") { node("ubuntu-2004 && amd64 && !zfs && cgroup1") {
def scmvar = checkout(scm) def scmvar = checkout(scm)
def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}" def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}"
def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim() def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim()

6
script/test/all
View File

@ -43,7 +43,6 @@ 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:/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 \
@ -51,6 +50,11 @@ for version in $DOCKER_VERSIONS; do
docker exec "$daemon_container" sh -c "apk add --no-cache git" docker exec "$daemon_container" sh -c "apk add --no-cache git"
# copy docker config from host for authentication with Docker Hub
docker exec "$daemon_container" sh -c "mkdir /root/.docker"
docker cp /root/.docker/config.json $daemon_container:/root/.docker/config.json
docker exec "$daemon_container" sh -c "chmod 644 /root/.docker/config.json"
docker run \ docker run \
--rm \ --rm \
--tty \ --tty \