From 64cd2d2047aab1007d90b8e2fa5d900325bb0a29 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Fri, 15 Nov 2024 12:17:45 +0300 Subject: [PATCH 1/2] test: rootless dind --- lib/logger.js | 4 ++-- service.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/logger.js b/lib/logger.js index 7b2a71e..a14b94e 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -44,8 +44,8 @@ class Logger { dockerSockPath = fs.existsSync('//./pipe/codefresh/docker_engine') ? '//./pipe/codefresh/docker_engine' : '//./pipe/docker_engine'; } else { - dockerSockPath = fs.existsSync('/var/run/codefresh/docker.sock') - ? '/var/run/codefresh/docker.sock' : '/var/run/docker.sock'; + dockerSockPath = fs.existsSync('/var/run/docker.sock') + ? '/var/run/docker.sock' : '/run/user/1000/docker.sock'; } this.docker = new Docker({ diff --git a/service.yaml b/service.yaml index 6db6875..0c28069 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.11.7 +version: 1.11.8 From 9568ef7c44aa39eb3a778ff8ddb63be8f557d18d Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Fri, 15 Nov 2024 12:29:27 +0300 Subject: [PATCH 2/2] test: rootless dind --- lib/logger.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/logger.js b/lib/logger.js index a14b94e..ee57b81 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -44,8 +44,7 @@ class Logger { dockerSockPath = fs.existsSync('//./pipe/codefresh/docker_engine') ? '//./pipe/codefresh/docker_engine' : '//./pipe/docker_engine'; } else { - dockerSockPath = fs.existsSync('/var/run/docker.sock') - ? '/var/run/docker.sock' : '/run/user/1000/docker.sock'; + dockerSockPath = '/run/user/1000/docker.sock'; } this.docker = new Docker({