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:23:55 +02:00
parent 361d45e086
commit 7924ba26a2
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -34,13 +34,13 @@ let sortDockerfiles = function(){
NpmciEnv.dockerFiles.forEach(function(dockerfileArg){ NpmciEnv.dockerFiles.forEach(function(dockerfileArg){
cleanTags.push(dockerfileArg.cleanTag); cleanTags.push(dockerfileArg.cleanTag);
}); });
let aIndex = cleanTags.indexOf(a.cleanTag); let aIndex = cleanTags.indexOf(a.baseImage);
let bIndex = cleanTags.indexOf(b.baseImage); let bIndex = cleanTags.indexOf(b.cleanTag);
console.log(cleanTags); console.log(cleanTags);
console.log(a.cleanTag); console.log(a.baseImage,aIndex);
console.log(b.cleanTag); console.log(b.cleanTag,bIndex);
if(bIndex < aIndex && bIndex != -1){ if(aIndex < bIndex && bIndex != -1){
return -1; return 1;
} else { } else {
return 0 return 0
} }
@ -117,12 +117,12 @@ let dockerBaseImage = function(dockerfileContentArg:string){
export let dockerTag = function(repoArg:string,versionArg:string):string{ export let dockerTag = function(repoArg:string,versionArg:string):string{
let tagString:string; let tagString:string;
let registry = NpmciEnv.dockerRegistry; let registry = NpmciEnv.dockerRegistry;
if(process.env.CI_BUILD_STAGE == "test"){ if(process.env.CI_BUILD_STAGE == "build" || process.env.CI_BUILD_STAGE == "test"){
registry = "registry.gitlab.com"; registry = "registry.gitlab.com";
} }
let repo = repoArg; let repo = repoArg;
let version = versionArg; let version = versionArg;
if(process.env.CI_BUILD_STAGE == "test" || process.env.CI_BUILD_STAGE == "build"){ if(process.env.CI_BUILD_STAGE == "build" || process.env.CI_BUILD_STAGE == "test"){
version = version + "_test"; version = version + "_test";
} }
tagString = registry + "/" + repo + ":" + version; tagString = registry + "/" + repo + ":" + version;