Comparing version 0.0.1 to 0.0.2
@@ -1,2 +0,3 @@ | ||
var crypto = require('crypto'); | ||
var crypto = require('crypto'); | ||
var Q = require('q'); | ||
@@ -33,23 +34,27 @@ function getLatestSha(user, repoOwner, repoName, branch) { | ||
//we need a sha for every branch. | ||
var revisionMarkerPromise = useDockerfileFromRepo ? | ||
getLatestSha(user, repoOwner, repoName, branch) : | ||
Q(""); //jshint ignore:line | ||
var revisionMarkerPromise = Q(''); //jshint ignore:line | ||
if (useDockerfileFromRepo) { | ||
revisionMarkerPromise = revisionMarkerPromise.then(function () { | ||
return getLatestSha(user, repoOwner, repoName, branch); | ||
}); | ||
} | ||
return revisionMarkerPromise.then(function (revisionMarker) { | ||
var hash = crypto.createHash('sha1'); | ||
hash.update( | ||
JSON.stringify(build_sh) + | ||
JSON.stringify(start_sh) + | ||
JSON.stringify(useDockerfileFromRepo) + | ||
revisionMarker); | ||
return revisionMarkerPromise | ||
.then(function (revisionMarker) { | ||
var hash = crypto.createHash('sha1'); | ||
hash.update( | ||
JSON.stringify(build_sh) + | ||
JSON.stringify(start_sh) + | ||
JSON.stringify(useDockerfileFromRepo) + | ||
revisionMarker); | ||
var buildHash = hash.digest('hex'); | ||
var buildHash = hash.digest('hex'); | ||
return { | ||
build_sh: build_sh, | ||
start_sh: start_sh, | ||
hash: buildHash, | ||
imageName: (repoOwner + '/' + repoName + ':' + buildHash).replace(/-/g, '_').toLowerCase() | ||
}; | ||
}); | ||
return { | ||
build_sh: build_sh, | ||
start_sh: start_sh, | ||
hash: buildHash, | ||
imageName: (repoOwner + '/' + repoName + ':' + buildHash).replace(/-/g, '_').toLowerCase() | ||
}; | ||
}); | ||
}; | ||
@@ -56,0 +61,0 @@ |
{ | ||
"name": "cf-common", | ||
"version": "0.0.1", | ||
"version": "0.0.2", | ||
"description": "common modules for codefresh runtime and api", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
2553
56