Spearhead/node-spearhead
Archived
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

joyent/node-triton#190 Exception when using current docker client

Browse Source 
Reviewed by: Kody A Kantor <kody.kantor@gmail.com>
Reviewed by: Trent Mick <trentm@gmail.com>
Approved by: Trent Mick <trentm@gmail.com>
This commit is contained in:
Marc-André Tremblay 2017-03-16 17:32:30 -07:00 committed by Trent Mick
parent a3071585aa
commit f27d502d92
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/do_profile/profilecommon.js
View File

@ -459,7 +459,10 @@ function profileDockerSetup(opts, cb) {
if (!arg.dockerVersion) { if (!arg.dockerVersion) {
setup.env.DOCKER_CLIENT_TIMEOUT = '300'; setup.env.DOCKER_CLIENT_TIMEOUT = '300';
setup.env.COMPOSE_HTTP_TIMEOUT = '300'; setup.env.COMPOSE_HTTP_TIMEOUT = '300';
} else if (semver.gte(arg.dockerVersion, '1.9.0')) { } else if (!semver.parse(arg.dockerVersion) ||
semver.gte(arg.dockerVersion, '1.9.0')) {
// If version isn't valid semver, we are certain it's >= 1.9
// since all versions of Docker before 1.9 *were*.
setup.env.COMPOSE_HTTP_TIMEOUT = '300'; setup.env.COMPOSE_HTTP_TIMEOUT = '300';
} else { } else {
setup.env.DOCKER_CLIENT_TIMEOUT = '300'; setup.env.DOCKER_CLIENT_TIMEOUT = '300';