From 1250bb74816d0124ec698b70911cf41c8af0e8bf Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Tue, 13 Apr 2021 17:11:29 +0200 Subject: [PATCH 1/5] Update node spec in Jenkinsfile Signed-off-by: Anca Iordache --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e26a85b3c..454f9bb85 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -87,7 +87,7 @@ def buildImage(baseImage) { def runTests(dockerVersion, pythonVersion, baseImage) { return { stage("python=${pythonVersion} docker=${dockerVersion} ${baseImage}") { - node("ubuntu && amd64 && !zfs") { + node("ubuntu-2004 && amd64 && !zfs && cgroup1") { def scmvar = checkout(scm) def imageName = "dockerpinata/compose:${baseImage}-${scmvar.GIT_COMMIT}" def storageDriver = sh(script: "docker info -f \'{{.Driver}}\'", returnStdout: true).trim() From d79745a2cd16719200c2ceb6bf51cceb955a66c1 Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Tue, 13 Apr 2021 18:10:59 +0200 Subject: [PATCH 2/5] hardcode path to docker config Signed-off-by: Anca Iordache --- script/test/all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/test/all b/script/test/all index fba670eb3..e557b5e6c 100755 --- a/script/test/all +++ b/script/test/all @@ -43,7 +43,7 @@ for version in $DOCKER_VERSIONS; do --name "$daemon_container" \ --privileged \ --volume="/var/lib/docker" \ - -v $DOCKER_CONFIG/config.json:/root/.docker/config.json \ + -v /root/.docker/config.json:/root/.docker/config.json \ -e "DOCKER_TLS_CERTDIR=" \ "docker:$version-dind" \ dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \ From 8f9f1111f3bc1c642d856adbdb89e7a516fe1b1f Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Thu, 15 Apr 2021 11:56:41 +0200 Subject: [PATCH 3/5] Copy the .docker/config to dind container for authentication Signed-off-by: Anca Iordache --- script/test/all | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/test/all b/script/test/all index e557b5e6c..27c7595c7 100755 --- a/script/test/all +++ b/script/test/all @@ -43,7 +43,6 @@ for version in $DOCKER_VERSIONS; do --name "$daemon_container" \ --privileged \ --volume="/var/lib/docker" \ - -v /root/.docker/config.json:/root/.docker/config.json \ -e "DOCKER_TLS_CERTDIR=" \ "docker:$version-dind" \ dockerd -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \ @@ -51,6 +50,10 @@ for version in $DOCKER_VERSIONS; do docker exec "$daemon_container" sh -c "apk add --no-cache git" + # copy docker config from host for authentication with Docker Hub + docker cp /root/.docker/config $daemon_container:/root/.docker/config + docker exec "$daemon_container" sh -c "chmod 644 /root/.docker/config" + docker run \ --rm \ --tty \ From c3d8e558a2594818f8030e4797cbd997c1ea9043 Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Thu, 15 Apr 2021 13:58:02 +0200 Subject: [PATCH 4/5] update path Signed-off-by: Anca Iordache --- script/test/all | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/test/all b/script/test/all index 27c7595c7..0c01d73b3 100755 --- a/script/test/all +++ b/script/test/all @@ -51,8 +51,8 @@ for version in $DOCKER_VERSIONS; do docker exec "$daemon_container" sh -c "apk add --no-cache git" # copy docker config from host for authentication with Docker Hub - docker cp /root/.docker/config $daemon_container:/root/.docker/config - docker exec "$daemon_container" sh -c "chmod 644 /root/.docker/config" + 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 \ --rm \ From 6ea24001fad37c8327bca6048e56aabcb27ad543 Mon Sep 17 00:00:00 2001 From: Anca Iordache Date: Thu, 15 Apr 2021 14:16:05 +0200 Subject: [PATCH 5/5] mkdir .docker directory before copying the config Signed-off-by: Anca Iordache --- script/test/all | 1 + 1 file changed, 1 insertion(+) diff --git a/script/test/all b/script/test/all index 0c01d73b3..63fc0255e 100755 --- a/script/test/all +++ b/script/test/all @@ -51,6 +51,7 @@ for version in $DOCKER_VERSIONS; do 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"