Skip to content

Commit bba42e6

Browse files
Now using /var/run/codefresh/docker.sock if available, otherwise /var/run/docker.sock
1 parent f0cae1a commit bba42e6

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

lib/logger.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,18 @@ class Logger {
2020
this.firebaseSecret = firebaseSecret;
2121
this.loggerId = loggerId;
2222
this.findExistingContainers = findExistingContainers === 'true';
23+
24+
let dockerSockPath;
25+
if (fs.existsSync('/var/run/codefresh/docker.sock')) {
26+
dockerSockPath = '/var/run/codefresh/docker.sock';
27+
console.log('Using /var/run/codefresh/docker.sock');
28+
} else {
29+
dockerSockPath = '/var/run/docker.sock';
30+
console.log('Using /var/run/docker.sock');
31+
}
32+
2333
this.docker = new Docker({
24-
socketPath: '/var/run/codefresh/docker.sock',
34+
socketPath: dockerSockPath,
2535
});
2636
}
2737

test/logger.unit.spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ describe('Logger tests', () => {
280280

281281
const Logger = proxyquire('../lib/logger', {
282282
'fs': {
283-
writeFile: writeFileSpy
283+
writeFile: writeFileSpy,
284+
existsSync: () => { return true; }
284285
}
285286
});
286287

@@ -296,7 +297,8 @@ describe('Logger tests', () => {
296297

297298
const Logger = proxyquire('../lib/logger', {
298299
'fs': {
299-
writeFile: writeFileSpy
300+
writeFile: writeFileSpy,
301+
existsSync: () => { return true; },
300302
}
301303
});
302304

0 commit comments

Comments
 (0)