Merge pull request #8281 from aiordache/Jenkins_update

Update node spec in Jenkinsfile and Docker config mount

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()

script/test/all

@@ -43,7 +43,6 @@ for version in $DOCKER_VERSIONS; do
     --name "$daemon_container" \
     --privileged \
     --volume="/var/lib/docker" \
-    -v $DOCKER_CONFIG/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,11 @@ 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"
+
   docker run \
     --rm \
     --tty \