ship.zone/npmci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Philipp Kunz 2016-06-05 08:30:08 +02:00
parent 6334396bfc
commit 87f6adeda4
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/npmci.build.docker.js vendored
View File

File diff suppressed because one or more lines are too long

9
ts/npmci.build.docker.ts
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 {