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

now sorting Dockerfiles correctly

Browse Source
This commit is contained in:
Philipp Kunz
2016-06-05 10:11:01 +02:00
parent 61720f47be
commit cb7cb852ea
4 changed files with 30 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ts/npmci.build.docker.ts
View File

@ -29,36 +29,23 @@ let readDockerfiles = function(){
let sortDockerfiles = function(){
let done = plugins.q.defer();
let redoSort:boolean;
let sortCounter:number = 0;
let sortFunction = function(){
redoSort = false;
let notYetBuiltImages:string[] = [];
NpmciEnv.dockerFiles.forEach((dockerFileArg)=>{
notYetBuiltImages.push(dockerFileArg.cleanTag);
NpmciEnv.dockerFiles.sort(function(a,b){
let cleanTags = [];
NpmciEnv.dockerFiles.forEach(function(dockerfileArg){
cleanTags.push(dockerfileArg.cleanTag);
});
NpmciEnv.dockerFiles.sort(function(a,b){
console.log("iteration: " + sortCounter.toString());
console.log(notYetBuiltImages)
console.log(a.cleanTag);
let aIndex = notYetBuiltImages.indexOf(a.cleanTag);
if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}
console.log(notYetBuiltImages);
if(notYetBuiltImages.indexOf(b.baseImage) != -1){
redoSort = true;
return -1;
} else {
return 0
}
});
if(redoSort && sortCounter <= 50){
sortCounter++;
sortFunction();
let aIndex = cleanTags.indexOf(a.cleanTag);
let bIndex = cleanTags.indexOf(b.baseImage);
console.log(cleanTags);
console.log(a.cleanTag);
console.log(b.cleanTag);
if(bIndex < aIndex && bIndex != -1){
return -1;
} else {
done.resolve();
return 0
}
};
sortFunction();
});
done.resolve();
return done.promise;
}

2
ts/npmci.env.ts
View File

@ -4,8 +4,6 @@ import {GitRepo} from "smartstring";
import {Dockerfile} from "./npmci.build.docker"
export let repo = new GitRepo(process.env.CI_BUILD_REPO);
console.log(process.env.CI_BUILD_REPO);
console.log(repo);
export let dockerTestTag:string;
export let dockerReleaseTag:string;