Compare commits

...

2 Commits

Author SHA1 Message Date
bb44333d70 2.1.20 2016-06-05 08:30:12 +02:00
87f6adeda4 fix 2016-06-05 08:30:08 +02:00
3 changed files with 14 additions and 8 deletions

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{ {
"name": "npmci", "name": "npmci",
"version": "2.1.19", "version": "2.1.20",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {

View File

@@ -38,17 +38,20 @@ let sortDockerfiles = function(){
notYetBuiltImages.push(dockerFileArg.cleanTag); notYetBuiltImages.push(dockerFileArg.cleanTag);
}); });
NpmciEnv.dockerFiles.sort(function(a,b){ NpmciEnv.dockerFiles.sort(function(a,b){
plugins.beautylog.log("sort build order for Dockerimages"); console.log("iteration: " + sortCounter.toString());
console.log(notYetBuiltImages)
console.log(a.cleanTag);
let aIndex = notYetBuiltImages.indexOf(a.cleanTag); let aIndex = notYetBuiltImages.indexOf(a.cleanTag);
if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)} if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}
console.log(notYetBuiltImages);
if(notYetBuiltImages.indexOf(b.cleanTag) != -1){ if(notYetBuiltImages.indexOf(b.cleanTag) != -1){
redoSort = true; redoSort = true;
return 1; return -1;
} else { } else {
return 0 return 0
} }
}); });
if(redoSort && sortCounter <= 100){ if(redoSort && sortCounter <= 50){
sortCounter++; sortCounter++;
sortFunction(); sortFunction();
} else { } else {