From 6cfdbb336fa27837c398f6790486dc52869729a0 Mon Sep 17 00:00:00 2001 From: Laszlo Bodor Date: Fri, 15 Nov 2024 10:34:14 +0100 Subject: [PATCH 1/2] HIVE-28629: Upgrade dind in precommit --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5dfefaf614e5..3b5b8d639aec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -135,10 +135,10 @@ def hdbPodTemplate(closure) { resourceRequestMemory: '6400Mi', resourceLimitMemory: '12000Mi', envVars: [ - envVar(key: 'DOCKER_HOST', value: 'tcp://localhost:2375') + envVar(key: 'DOCKER_HOST', value: 'tcp://localhost:2376') ] ), - containerTemplate(name: 'dind', image: 'docker:18.05-dind', + containerTemplate(name: 'dind', image: 'docker:20.10-dind', alwaysPullImage: true, privileged: true, ), From 9ecb71fc50bec3c4ef5cebc6c77dbde919782530 Mon Sep 17 00:00:00 2001 From: Stamatis Zampetakis Date: Fri, 14 Feb 2025 15:42:55 +0100 Subject: [PATCH 2/2] Setup TLS configuration for docker client/server --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b5b8d639aec..cb337bd21c62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -135,16 +135,21 @@ def hdbPodTemplate(closure) { resourceRequestMemory: '6400Mi', resourceLimitMemory: '12000Mi', envVars: [ - envVar(key: 'DOCKER_HOST', value: 'tcp://localhost:2376') + envVar(key: 'DOCKER_TLS', value: '1'), + envVar(key: 'DOCKER_CERT_PATH', value: '/certs/client') ] ), containerTemplate(name: 'dind', image: 'docker:20.10-dind', alwaysPullImage: true, privileged: true, + envVars: [ + envVar(key: 'DOCKER_TLS_CERTDIR', value: '/certs') + ] ), ], volumes: [ emptyDirVolume(mountPath: '/var/lib/docker', memory: false), + emptyDirVolume(mountPath: '/certs', memory: false) ], yaml:''' spec: securityContext: