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

Merge 44a50c06ac into a3071585aa

Browse Source
This commit is contained in:
Marc Tremblay 2017-03-15 19:18:59 +00:00 committed by GitHub
commit 507eb11ad8
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/do_profile/profilecommon.js
View File

@ -459,10 +459,32 @@ function profileDockerSetup(opts, cb) {
if (!arg.dockerVersion) {
setup.env.DOCKER_CLIENT_TIMEOUT = '300';
setup.env.COMPOSE_HTTP_TIMEOUT = '300';
} else if (semver.gte(arg.dockerVersion, '1.9.0')) {
setup.env.COMPOSE_HTTP_TIMEOUT = '300';
} else {
setup.env.DOCKER_CLIENT_TIMEOUT = '300';
/*
* We now need to parse version numbers differently since the
* introduction of Docker CE and EE. semver won't like them.
*/
var versionNumberExp = /(?:\d+\.){2}\d+/;
var versionNumber = versionNumberExp.exec(arg.dockerVersion)[0];
/*
* semver also doesn't seem to like versions like `17.03.0'.
* The prefixing 0 in the minor number of the exemple seems
* to hurt it. Let's parse them back to numbers with no
* prefixing `0's.
*/
versionNumber = versionNumber
.split('.')
.map(function (strnum) { return parseInt(strnum, 10); })
.join('.');
if (semver.gte(versionNumber, '1.9.0')) {
setup.env.COMPOSE_HTTP_TIMEOUT = '300';
} else {
setup.env.DOCKER_CLIENT_TIMEOUT = '300';
}
}
fs.writeFile(setupJson,