diff --git a/dist/npmci.build.docker.d.ts b/dist/npmci.build.docker.d.ts index 58e1106..4d2478a 100644 --- a/dist/npmci.build.docker.d.ts +++ b/dist/npmci.build.docker.d.ts @@ -1,6 +1,6 @@ export declare let build: () => any; export declare let readDockerfiles: () => any; -export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[]) => string[]; +export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[]; export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => any; export declare let buildDockerfiles: () => any; export declare class Dockerfile { diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index 07376ab..97a8e94 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -21,31 +21,39 @@ exports.readDockerfiles = function () { })); return done.promise; }; -exports.cleanTagsArrayFunction = function (dockerfileArrayArg) { +exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) { var cleanTagsArray = []; dockerfileArrayArg.forEach(function (dockerfileArg) { - cleanTagsArray.push(dockerfileArg.cleanTag); + if (trackingArrayArg.indexOf(dockerfileArg) == -1) { + cleanTagsArray.push(dockerfileArg.cleanTag); + } }); return cleanTagsArray; }; exports.sortDockerfiles = function (sortableArrayArg) { var done = plugins.q.defer(); var sortedArray = []; + var trackingArray = []; var sorterFunctionCounter = 0; + console.log(sortableArrayArg); + console.log(sortedArray); var sorterFunction = function () { + plugins.beautylog.log("++++++++++++++++++++++++++++++++++++++++++++++"); console.log(sorterFunctionCounter); - var cleanTags = exports.cleanTagsArrayFunction(sortableArrayArg); sortableArrayArg.forEach(function (dockerfileArg) { - if (cleanTags.indexOf(dockerfileArg.baseImage) == -1) { - var dockerfileArgIndex = sortableArrayArg.indexOf(dockerfileArg); - sortableArrayArg.splice(dockerfileArgIndex, 1); + console.log(dockerfileArg); + var cleanTags = exports.cleanTagsArrayFunction(sortableArrayArg, trackingArray); + console.log(cleanTags); + if (cleanTags.indexOf(dockerfileArg.baseImage) == -1 && trackingArray.indexOf(dockerfileArg) == -1) { sortedArray.push(dockerfileArg); + trackingArray.push(dockerfileArg); } }); - if (sortableArrayArg.length == 0) { + plugins.beautylog.info(sortedArray.length.toString()); + if (sortableArrayArg.length == sortedArray.length) { done.resolve(sortedArray); } - else if (sorterFunctionCounter < 100) { + else if (sorterFunctionCounter < 10) { sorterFunctionCounter++; sorterFunction(); } @@ -130,4 +138,4 @@ exports.dockerTag = function (repoArg, versionArg) { return tagString; }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["npmci.build.docker.ts"],"names":[],"mappings":";AAAA,IAAY,OAAO,WAAM,iBACzB,CAAC,CADyC;AAC1C,IAAY,QAAQ,WAAM,aAAa,CAAC,CAAA;AAG7B,aAAK,GAAG;IACf,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAE7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAA;AAEU,uBAAe,GAAG;IACzB,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC7B,IAAI,oBAAoB,GAAgB,EAAE,CAAA;IAC1C,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC;SAC5B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAS,IAAI,EAAC,GAAG,EAAC,EAAE;QAC3C,IAAI,YAAY,GAAG,IAAI,UAAU,CAAC;YAC9B,QAAQ,EAAC,IAAI,CAAC,IAAI;YAClB,IAAI,EAAC,IAAI;SACZ,CAAC,CAAC;QACH,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxC,EAAE,CAAC,IAAI,EAAC,IAAI,CAAC,CAAC;IACjB,CAAC,EAAC;QACE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC,CAAC;IACT,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAA;AAEU,8BAAsB,GAAG,UAAS,kBAA+B;IACxE,IAAI,cAAc,GAAY,EAAE,CAAC;IACjC,kBAAkB,CAAC,OAAO,CAAC,UAAS,aAAa;QAC7C,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,cAAc,CAAC;AAC1B,CAAC,CAAA;AAEU,uBAAe,GAAG,UAAS,gBAA6B;IAC/D,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC7B,IAAI,WAAW,GAAgB,EAAE,CAAC;IAClC,IAAI,qBAAqB,GAAU,CAAC,CAAC;IACrC,IAAI,cAAc,GAAG;QACjB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACnC,IAAI,SAAS,GAAG,8BAAsB,CAAC,gBAAgB,CAAC,CAAC;QACzD,gBAAgB,CAAC,OAAO,CAAC,UAAC,aAAa;YACnC,EAAE,CAAA,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA,CAAC;gBACjD,IAAI,kBAAkB,GAAG,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACjE,gBAAgB,CAAC,MAAM,CAAC,kBAAkB,EAAC,CAAC,CAAC,CAAC;gBAC9C,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAA,CAAC,gBAAgB,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qBAAqB,GAAG,GAAG,CAAC,CAAC,CAAC;YACrC,qBAAqB,EAAE,CAAC;YACxB,cAAc,EAAE,CAAC;QACrB,CAAC;QAAA,CAAC;IACN,CAAC,CAAA;IACD,cAAc,EAAE,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAA;AAEU,wBAAgB,GAAG;IAC1B,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,UAAS,aAAa;QAC/C,aAAa,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAA;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;IACf,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAA;AAED;IAQI,oBAAY,OAAoE;QAC5E,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1D,IAAI,CAAC,OAAO,GAAG,yBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/C,EAAE,CAAA,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA,CAAC;YACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChG,CAAC;QAAA,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,uBAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnD,CAAC;;IACD,0BAAK,GAAL;QACI,EAAE,CAAA,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA,CAAC;YACf,IAAI,GAAG,GAAG,iBAAS,CAAC,IAAI,CAAC,IAAI,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5C,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,GAAG,GAAG,GAAG,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;YAC/E,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;YACpB,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACvE,CAAC;IAEL,CAAC;;IACD,yBAAI,GAAJ;QACI,EAAE,CAAA,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA,CAAC;YACd,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzD,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IACL,iBAAC;AAAD,CApCA,AAoCC,IAAA;AApCY,kBAAU,aAoCtB,CAAA;AAEU,yBAAiB,GAAG,UAAS,iBAAwB;IAC5D,IAAI,aAAoB,CAAC;IACzB,IAAI,YAAY,GAAG,8BAA8B,CAAC;IAClD,IAAI,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC5D,EAAE,CAAA,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,IAAI,CAAC,CAAC,CAAA,CAAC;QACjD,aAAa,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAAC,IAAI,CAAC,CAAC;QACJ,aAAa,GAAG,QAAQ,CAAC;IAC7B,CAAC;IACD,MAAM,CAAC,aAAa,CAAC;AACzB,CAAC,CAAA;AAEU,uBAAe,GAAG,UAAS,oBAA2B;IAC7D,IAAI,cAAc,GAAG,+BAA+B,CAAA;IACpD,IAAI,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAChE,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAA;AAEU,iBAAS,GAAG,UAAS,OAAc,EAAC,UAAiB;IAC5D,IAAI,SAAgB,CAAC;IACrB,IAAI,QAAQ,GAAG,QAAQ,CAAC,cAAc,CAAC;IACvC,EAAE,CAAA,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,IAAK,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,CAAA,CAAC;QAC/E,QAAQ,GAAG,qBAAqB,CAAC;IACrC,CAAC;IACD,IAAI,IAAI,GAAG,OAAO,CAAC;IACnB,IAAI,OAAO,GAAG,UAAU,CAAC;IACzB,EAAE,CAAA,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,MAAM,CAAC,CAAA,CAAC;QAC9E,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;IAChC,CAAC;IACD,SAAS,GAAG,QAAQ,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,OAAO,CAAC;IAClD,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC,CAAC","file":"npmci.build.docker.js","sourcesContent":["import * as plugins from \"./npmci.plugins\"\nimport * as NpmciEnv from \"./npmci.env\";\n\n\nexport let build = function(){\n    let done = plugins.q.defer();\n    \n    return done.promise;\n}\n\nexport let readDockerfiles = function(){\n    let done = plugins.q.defer();\n    let readDockerfilesArray:Dockerfile[] = []\n    plugins.gulp.src(\"./Dockerfile*\")\n        .pipe(plugins.through2.obj(function(file,enc,cb){\n            let myDockerfile = new Dockerfile({\n                filePath:file.path,\n                read:true\n            });\n            readDockerfilesArray.push(myDockerfile);\n            cb(null,file);\n         },function(){\n             done.resolve(readDockerfilesArray);\n         }));\n    return done.promise;\n}\n\nexport let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[]):string[]{\n    let cleanTagsArray:string[] = [];\n    dockerfileArrayArg.forEach(function(dockerfileArg){\n        cleanTagsArray.push(dockerfileArg.cleanTag);\n    });\n    return cleanTagsArray;\n}\n\nexport let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){\n    let done = plugins.q.defer();\n    let sortedArray:Dockerfile[] = []; \n    let sorterFunctionCounter:number = 0;\n    let sorterFunction = function(){\n        console.log(sorterFunctionCounter);\n        let cleanTags = cleanTagsArrayFunction(sortableArrayArg);\n        sortableArrayArg.forEach((dockerfileArg)=>{\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1){\n                let dockerfileArgIndex = sortableArrayArg.indexOf(dockerfileArg);\n                sortableArrayArg.splice(dockerfileArgIndex,1);\n                sortedArray.push(dockerfileArg);\n            }\n        });\n        if(sortableArrayArg.length == 0){\n            done.resolve(sortedArray);\n        } else if (sorterFunctionCounter < 100) {\n            sorterFunctionCounter++;\n            sorterFunction();\n        };\n    }\n    sorterFunction();\n    return done.promise;\n}\n\nexport let buildDockerfiles = function(){\n    let done = plugins.q.defer();\n    NpmciEnv.dockerFiles.forEach(function(dockerfileArg){\n        dockerfileArg.build();\n    })\n    done.resolve();\n    return done.promise;\n}\n\nexport class Dockerfile {\n    filePath:string;\n    repo:string;\n    version:string;\n    cleanTag:string;\n    buildTag:string;\n    content:string;\n    baseImage:string;\n    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){\n        this.filePath = options.filePath;\n        this.repo = NpmciEnv.repo.user + \"/\" + NpmciEnv.repo.repo;\n        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);\n        this.cleanTag = this.repo + \":\" + this.version;\n        if(options.filePath && options.read){\n            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));\n        };\n        this.baseImage = dockerBaseImage(this.content);\n    };\n    build(){\n        if(!this.buildTag){\n            let tag = dockerTag(this.repo,this.version);\n            plugins.shelljs.exec(\"docker build -t \" + tag + \" -f \" + this.filePath + \" .\");\n            this.buildTag = tag;\n            NpmciEnv.dockerFilesBuilt.push(this);\n        } else {\n            plugins.beautylog.error(\"This Dockerfile already has been built!\");\n        }\n        \n    };\n    push(){\n        if(this.buildTag){\n            plugins.shelljs.exec(\"docker push \" + this.buildTag);\n        } else {\n            plugins.beautylog.error(\"Dockerfile hasn't been built yet!\");\n        }\n    }\n}\n\nexport let dockerFileVersion = function(dockerfileNameArg:string):string{\n    let versionString:string;\n    let versionRegex = /Dockerfile_([a-zA-Z0-9\\.]*)$/;\n    let regexResultArray = versionRegex.exec(dockerfileNameArg);\n    if(regexResultArray && regexResultArray.length == 2){\n        versionString = regexResultArray[1];        \n    } else {\n        versionString = \"latest\";\n    }\n    return versionString;\n}\n\nexport let dockerBaseImage = function(dockerfileContentArg:string){\n    let baseImageRegex = /FROM\\s([a-zA-z0-9\\/\\-\\:]*)\\n?/\n    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)\n    return regexResultArray[1];\n}\n\nexport let dockerTag = function(repoArg:string,versionArg:string):string{\n    let tagString:string;\n    let registry = NpmciEnv.dockerRegistry;\n    if(process.env.CI_BUILD_STAGE == \"build\"  || process.env.CI_BUILD_STAGE == \"test\"){\n        registry = \"registry.gitlab.com\";\n    } \n    let repo = repoArg;\n    let version = versionArg;\n    if(process.env.CI_BUILD_STAGE == \"build\" || process.env.CI_BUILD_STAGE == \"test\"){\n        version = version + \"_test\";\n    }\n    tagString = registry + \"/\" + repo + \":\" + version;\n    return tagString;\n};\n"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["npmci.build.docker.ts"],"names":[],"mappings":"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","file":"npmci.build.docker.js","sourcesContent":["import * as plugins from \"./npmci.plugins\"\nimport * as NpmciEnv from \"./npmci.env\";\n\nexport let build = function(){\n    let done = plugins.q.defer();\n    \n    return done.promise;\n}\n\nexport let readDockerfiles = function(){\n    let done = plugins.q.defer();\n    let readDockerfilesArray:Dockerfile[] = []\n    plugins.gulp.src(\"./Dockerfile*\")\n        .pipe(plugins.through2.obj(function(file,enc,cb){\n            let myDockerfile = new Dockerfile({\n                filePath:file.path,\n                read:true\n            });\n            readDockerfilesArray.push(myDockerfile);\n            cb(null,file);\n         },function(){\n             done.resolve(readDockerfilesArray);\n         }));\n    return done.promise;\n}\n\nexport let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[],trackingArrayArg:Dockerfile[]):string[]{\n    let cleanTagsArray:string[] = [];\n    dockerfileArrayArg.forEach(function(dockerfileArg){\n        if(trackingArrayArg.indexOf(dockerfileArg) == -1){\n            cleanTagsArray.push(dockerfileArg.cleanTag);\n        }\n    });\n    return cleanTagsArray;\n}\n\nexport let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){\n    let done = plugins.q.defer();\n    let sortedArray:Dockerfile[] = []; \n    let trackingArray:Dockerfile[] = [];\n    let sorterFunctionCounter:number = 0;\n    console.log(sortableArrayArg);\n    console.log(sortedArray);\n    let sorterFunction = function(){\n        plugins.beautylog.log(\"++++++++++++++++++++++++++++++++++++++++++++++\");\n        console.log(sorterFunctionCounter);\n        sortableArrayArg.forEach((dockerfileArg)=>{\n            console.log(dockerfileArg);\n            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,trackingArray);\n            console.log(cleanTags);\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && trackingArray.indexOf(dockerfileArg) == -1){\n                sortedArray.push(dockerfileArg);\n                trackingArray.push(dockerfileArg);\n            }\n        });\n        plugins.beautylog.info(sortedArray.length.toString());\n        if(sortableArrayArg.length == sortedArray.length){\n            done.resolve(sortedArray);\n        } else if (sorterFunctionCounter < 10) {\n            sorterFunctionCounter++;\n            sorterFunction();\n        };\n    }\n    sorterFunction();\n    return done.promise;\n}\n\nexport let buildDockerfiles = function(){\n    let done = plugins.q.defer();\n    NpmciEnv.dockerFiles.forEach(function(dockerfileArg){\n        dockerfileArg.build();\n    })\n    done.resolve();\n    return done.promise;\n}\n\nexport class Dockerfile {\n    filePath:string;\n    repo:string;\n    version:string;\n    cleanTag:string;\n    buildTag:string;\n    content:string;\n    baseImage:string;\n    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){\n        this.filePath = options.filePath;\n        this.repo = NpmciEnv.repo.user + \"/\" + NpmciEnv.repo.repo;\n        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);\n        this.cleanTag = this.repo + \":\" + this.version;\n        if(options.filePath && options.read){\n            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));\n        };\n        this.baseImage = dockerBaseImage(this.content);\n    };\n    build(){\n        if(!this.buildTag){\n            let tag = dockerTag(this.repo,this.version);\n            plugins.shelljs.exec(\"docker build -t \" + tag + \" -f \" + this.filePath + \" .\");\n            this.buildTag = tag;\n            NpmciEnv.dockerFilesBuilt.push(this);\n        } else {\n            plugins.beautylog.error(\"This Dockerfile already has been built!\");\n        }\n        \n    };\n    push(){\n        if(this.buildTag){\n            plugins.shelljs.exec(\"docker push \" + this.buildTag);\n        } else {\n            plugins.beautylog.error(\"Dockerfile hasn't been built yet!\");\n        }\n    }\n}\n\nexport let dockerFileVersion = function(dockerfileNameArg:string):string{\n    let versionString:string;\n    let versionRegex = /Dockerfile_([a-zA-Z0-9\\.]*)$/;\n    let regexResultArray = versionRegex.exec(dockerfileNameArg);\n    if(regexResultArray && regexResultArray.length == 2){\n        versionString = regexResultArray[1];        \n    } else {\n        versionString = \"latest\";\n    }\n    return versionString;\n}\n\nexport let dockerBaseImage = function(dockerfileContentArg:string){\n    let baseImageRegex = /FROM\\s([a-zA-z0-9\\/\\-\\:]*)\\n?/\n    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)\n    return regexResultArray[1];\n}\n\nexport let dockerTag = function(repoArg:string,versionArg:string):string{\n    let tagString:string;\n    let registry = NpmciEnv.dockerRegistry;\n    if(process.env.CI_BUILD_STAGE == \"build\"  || process.env.CI_BUILD_STAGE == \"test\"){\n        registry = \"registry.gitlab.com\";\n    } \n    let repo = repoArg;\n    let version = versionArg;\n    if(process.env.CI_BUILD_STAGE == \"build\" || process.env.CI_BUILD_STAGE == \"test\"){\n        version = version + \"_test\";\n    }\n    tagString = registry + \"/\" + repo + \":\" + version;\n    return tagString;\n};\n"]} diff --git a/test/assets/Dockerfile_sometag1 b/test/assets/Dockerfile_sometag1 index 9234e6a..4136814 100644 --- a/test/assets/Dockerfile_sometag1 +++ b/test/assets/Dockerfile_sometag1 @@ -1,2 +1,2 @@ -FROM myrepo/mygroup:sometag2 +FROM mygroup/myrepo:sometag2 RUN apt-get update \ No newline at end of file diff --git a/test/test.js b/test/test.js index 34603b4..327b9e6 100644 --- a/test/test.js +++ b/test/test.js @@ -2,6 +2,7 @@ require("typings-test"); require("should"); var path = require("path"); +var beautylog = require("beautylog"); //set up environment process.env.CI_BUILD_REPO = "https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git"; process.cwd = function () { @@ -31,6 +32,7 @@ describe("NPMCI", function () { it("should sort an array of Dockerfiles", function (done) { NpmciBuildDocker.sortDockerfiles(sortableArray) .then(function (sortedArrayArg) { + beautylog.success("final result"); console.log(sortedArrayArg); done(); }); @@ -38,4 +40,4 @@ describe("NPMCI", function () { }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixJQUFPLElBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUM5QixvQkFBb0I7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEdBQUcsdURBQXVELENBQUM7QUFDcEYsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQztBQUMxQyxDQUFDLENBQUM7QUFFRixxQkFBcUI7QUFDckIsSUFBTyxnQkFBZ0IsV0FBVyw0QkFBNEIsQ0FBQyxDQUFDO0FBR2hFLElBQUksV0FBdUMsQ0FBQztBQUM1QyxJQUFJLFdBQXVDLENBQUM7QUFDNUMsSUFBSSxhQUEyQyxDQUFDO0FBRWhELFFBQVEsQ0FBQyxPQUFPLEVBQUM7SUFDYixRQUFRLENBQUMsY0FBYyxFQUFDO1FBQ3BCLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQztZQUNqQyxXQUFXLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsRUFBQyxRQUFRLEVBQUMsY0FBYyxFQUFDLElBQUksRUFBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDO1lBQ25GLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBQyx1QkFBdUIsRUFBQyxJQUFJLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQztZQUM1RixXQUFXLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDM0MsV0FBVyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLHdDQUF3QyxFQUFDLFVBQVMsSUFBSTtZQUNyRCxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7aUJBQzdCLElBQUksQ0FBQyxVQUFTLHVCQUFxRDtnQkFDaEUsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQzVELGFBQWEsR0FBRyx1QkFBdUIsQ0FBQTtnQkFDdkMsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFBO1FBQ0YsRUFBRSxDQUFDLHFDQUFxQyxFQUFDLFVBQVMsSUFBSTtZQUNsRCxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDO2lCQUMxQyxJQUFJLENBQUMsVUFBUyxjQUE0QztnQkFDdkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIjtcbmltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XG4vL3NldCB1cCBlbnZpcm9ubWVudFxucHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTyA9IFwiaHR0cHM6Ly95eXl5eXk6eHh4eHh4eHhAZ2l0bGFiLmNvbS9teWdyb3VwL215cmVwby5naXRcIjtcbnByb2Nlc3MuY3dkID0gKCkgPT4ge1xuICAgIHJldHVybiBwYXRoLmpvaW4oX19kaXJuYW1lLFwiYXNzZXRzL1wiKTtcbn07XG5cbi8vcmVxdWlyZSBOUE1DSSBmaWxlc1xuaW1wb3J0IE5wbWNpQnVpbGREb2NrZXIgPSByZXF1aXJlKFwiLi4vZGlzdC9ucG1jaS5idWlsZC5kb2NrZXJcIik7XG5cblxubGV0IGRvY2tlcmZpbGUxOk5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZTtcbmxldCBkb2NrZXJmaWxlMjpOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGU7XG5sZXQgc29ydGFibGVBcnJheTpOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGVbXTtcblxuZGVzY3JpYmUoXCJOUE1DSVwiLGZ1bmN0aW9uKCl7XG4gICAgZGVzY3JpYmUoXCJidWlsZC5kb2NrZXJcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCByZXR1cm4gdmFsaWQgRG9ja2VyZmlsZXNcIixmdW5jdGlvbigpe1xuICAgICAgICAgICAgZG9ja2VyZmlsZTEgPSBuZXcgTnBtY2lCdWlsZERvY2tlci5Eb2NrZXJmaWxlKHtmaWxlUGF0aDpcIi4vRG9ja2VyZmlsZVwiLHJlYWQ6dHJ1ZX0pO1xuICAgICAgICAgICAgZG9ja2VyZmlsZTIgPSBuZXcgTnBtY2lCdWlsZERvY2tlci5Eb2NrZXJmaWxlKHtmaWxlUGF0aDpcIi4vRG9ja2VyZmlsZV9zb21ldGFnMVwiLHJlYWQ6dHJ1ZX0pO1xuICAgICAgICAgICAgZG9ja2VyZmlsZTEudmVyc2lvbi5zaG91bGQuZXF1YWwoXCJsYXRlc3RcIik7XG4gICAgICAgICAgICBkb2NrZXJmaWxlMi52ZXJzaW9uLnNob3VsZC5lcXVhbChcInNvbWV0YWcxXCIpO1xuICAgICAgICB9KTtcbiAgICAgICAgaXQoXCJzaG91bGQgcmVhZCBhIGRpcmVjdG9yeSBvZiBEb2NrZXJmaWxlc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgTnBtY2lCdWlsZERvY2tlci5yZWFkRG9ja2VyZmlsZXMoKVxuICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHJlYWREb2NrZXJmaWxlc0FycmF5QXJnOk5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZVtdKXtcbiAgICAgICAgICAgICAgICAgICAgcmVhZERvY2tlcmZpbGVzQXJyYXlBcmdbMV0udmVyc2lvbi5zaG91bGQuZXF1YWwoXCJzb21ldGFnMVwiKTtcbiAgICAgICAgICAgICAgICAgICAgc29ydGFibGVBcnJheSA9IHJlYWREb2NrZXJmaWxlc0FycmF5QXJnXG4gICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgfSlcbiAgICAgICAgaXQoXCJzaG91bGQgc29ydCBhbiBhcnJheSBvZiBEb2NrZXJmaWxlc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgTnBtY2lCdWlsZERvY2tlci5zb3J0RG9ja2VyZmlsZXMoc29ydGFibGVBcnJheSlcbiAgICAgICAgICAgICAgICAudGhlbihmdW5jdGlvbihzb3J0ZWRBcnJheUFyZzpOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGVbXSl7XG4gICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHNvcnRlZEFycmF5QXJnKTtcbiAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgIH0pXG4gICAgICAgIH0pXG4gICAgfSlcbn0pIl19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixJQUFPLElBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUM5QixJQUFZLFNBQVMsV0FBTSxXQUUzQixDQUFDLENBRnFDO0FBQ3RDLG9CQUFvQjtBQUNwQixPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsR0FBRyx1REFBdUQsQ0FBQztBQUNwRixPQUFPLENBQUMsR0FBRyxHQUFHO0lBQ1YsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFDLENBQUMsQ0FBQztBQUVGLHFCQUFxQjtBQUNyQixJQUFPLGdCQUFnQixXQUFXLDRCQUE0QixDQUFDLENBQUM7QUFHaEUsSUFBSSxXQUF1QyxDQUFDO0FBQzVDLElBQUksV0FBdUMsQ0FBQztBQUM1QyxJQUFJLGFBQTJDLENBQUM7QUFFaEQsUUFBUSxDQUFDLE9BQU8sRUFBQztJQUNiLFFBQVEsQ0FBQyxjQUFjLEVBQUM7UUFDcEIsRUFBRSxDQUFDLGlDQUFpQyxFQUFDO1lBQ2pDLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBQyxjQUFjLEVBQUMsSUFBSSxFQUFDLElBQUksRUFBQyxDQUFDLENBQUM7WUFDbkYsV0FBVyxHQUFHLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEVBQUMsUUFBUSxFQUFDLHVCQUF1QixFQUFDLElBQUksRUFBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDO1lBQzVGLFdBQVcsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUMzQyxXQUFXLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDakQsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsd0NBQXdDLEVBQUMsVUFBUyxJQUFJO1lBQ3JELGdCQUFnQixDQUFDLGVBQWUsRUFBRTtpQkFDN0IsSUFBSSxDQUFDLFVBQVMsdUJBQXFEO2dCQUNoRSx1QkFBdUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFDNUQsYUFBYSxHQUFHLHVCQUF1QixDQUFBO2dCQUN2QyxJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUE7UUFDRixFQUFFLENBQUMscUNBQXFDLEVBQUMsVUFBUyxJQUFJO1lBQ2xELGdCQUFnQixDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUM7aUJBQzFDLElBQUksQ0FBQyxVQUFTLGNBQTRDO2dCQUN2RCxTQUFTLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUFDO2dCQUNsQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDO2dCQUM1QixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBIiwiZmlsZSI6InRlc3QuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLXRlc3RcIjtcbmltcG9ydCBcInNob3VsZFwiO1xuaW1wb3J0IHBhdGggPSByZXF1aXJlKFwicGF0aFwiKTtcbmltcG9ydCAqIGFzIGJlYXV0eWxvZyBmcm9tIFwiYmVhdXR5bG9nXCJcbi8vc2V0IHVwIGVudmlyb25tZW50XG5wcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPID0gXCJodHRwczovL3l5eXl5eTp4eHh4eHh4eEBnaXRsYWIuY29tL215Z3JvdXAvbXlyZXBvLmdpdFwiO1xucHJvY2Vzcy5jd2QgPSAoKSA9PiB7XG4gICAgcmV0dXJuIHBhdGguam9pbihfX2Rpcm5hbWUsXCJhc3NldHMvXCIpO1xufTtcblxuLy9yZXF1aXJlIE5QTUNJIGZpbGVzXG5pbXBvcnQgTnBtY2lCdWlsZERvY2tlciA9IHJlcXVpcmUoXCIuLi9kaXN0L25wbWNpLmJ1aWxkLmRvY2tlclwiKTtcblxuXG5sZXQgZG9ja2VyZmlsZTE6TnBtY2lCdWlsZERvY2tlci5Eb2NrZXJmaWxlO1xubGV0IGRvY2tlcmZpbGUyOk5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZTtcbmxldCBzb3J0YWJsZUFycmF5Ok5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZVtdO1xuXG5kZXNjcmliZShcIk5QTUNJXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcImJ1aWxkLmRvY2tlclwiLGZ1bmN0aW9uKCl7XG4gICAgICAgIGl0KFwic2hvdWxkIHJldHVybiB2YWxpZCBEb2NrZXJmaWxlc1wiLGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICBkb2NrZXJmaWxlMSA9IG5ldyBOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGUoe2ZpbGVQYXRoOlwiLi9Eb2NrZXJmaWxlXCIscmVhZDp0cnVlfSk7XG4gICAgICAgICAgICBkb2NrZXJmaWxlMiA9IG5ldyBOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGUoe2ZpbGVQYXRoOlwiLi9Eb2NrZXJmaWxlX3NvbWV0YWcxXCIscmVhZDp0cnVlfSk7XG4gICAgICAgICAgICBkb2NrZXJmaWxlMS52ZXJzaW9uLnNob3VsZC5lcXVhbChcImxhdGVzdFwiKTtcbiAgICAgICAgICAgIGRvY2tlcmZpbGUyLnZlcnNpb24uc2hvdWxkLmVxdWFsKFwic29tZXRhZzFcIik7XG4gICAgICAgIH0pO1xuICAgICAgICBpdChcInNob3VsZCByZWFkIGEgZGlyZWN0b3J5IG9mIERvY2tlcmZpbGVzXCIsZnVuY3Rpb24oZG9uZSl7XG4gICAgICAgICAgICBOcG1jaUJ1aWxkRG9ja2VyLnJlYWREb2NrZXJmaWxlcygpXG4gICAgICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24ocmVhZERvY2tlcmZpbGVzQXJyYXlBcmc6TnBtY2lCdWlsZERvY2tlci5Eb2NrZXJmaWxlW10pe1xuICAgICAgICAgICAgICAgICAgICByZWFkRG9ja2VyZmlsZXNBcnJheUFyZ1sxXS52ZXJzaW9uLnNob3VsZC5lcXVhbChcInNvbWV0YWcxXCIpO1xuICAgICAgICAgICAgICAgICAgICBzb3J0YWJsZUFycmF5ID0gcmVhZERvY2tlcmZpbGVzQXJyYXlBcmdcbiAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgIH0pO1xuICAgICAgICB9KVxuICAgICAgICBpdChcInNob3VsZCBzb3J0IGFuIGFycmF5IG9mIERvY2tlcmZpbGVzXCIsZnVuY3Rpb24oZG9uZSl7XG4gICAgICAgICAgICBOcG1jaUJ1aWxkRG9ja2VyLnNvcnREb2NrZXJmaWxlcyhzb3J0YWJsZUFycmF5KVxuICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHNvcnRlZEFycmF5QXJnOk5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZVtdKXtcbiAgICAgICAgICAgICAgICAgICAgYmVhdXR5bG9nLnN1Y2Nlc3MoXCJmaW5hbCByZXN1bHRcIik7XG4gICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHNvcnRlZEFycmF5QXJnKTtcbiAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgIH0pXG4gICAgICAgIH0pXG4gICAgfSlcbn0pIl19 diff --git a/test/test.ts b/test/test.ts index ebc1f8f..1bfd8c5 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,6 +1,7 @@ import "typings-test"; import "should"; import path = require("path"); +import * as beautylog from "beautylog" //set up environment process.env.CI_BUILD_REPO = "https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git"; process.cwd = () => { @@ -34,6 +35,7 @@ describe("NPMCI",function(){ it("should sort an array of Dockerfiles",function(done){ NpmciBuildDocker.sortDockerfiles(sortableArray) .then(function(sortedArrayArg:NpmciBuildDocker.Dockerfile[]){ + beautylog.success("final result"); console.log(sortedArrayArg); done(); }) diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index 2658790..3e412dc 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -1,7 +1,6 @@ import * as plugins from "./npmci.plugins" import * as NpmciEnv from "./npmci.env"; - export let build = function(){ let done = plugins.q.defer(); @@ -25,10 +24,12 @@ export let readDockerfiles = function(){ return done.promise; } -export let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[]):string[]{ +export let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[],trackingArrayArg:Dockerfile[]):string[]{ let cleanTagsArray:string[] = []; dockerfileArrayArg.forEach(function(dockerfileArg){ - cleanTagsArray.push(dockerfileArg.cleanTag); + if(trackingArrayArg.indexOf(dockerfileArg) == -1){ + cleanTagsArray.push(dockerfileArg.cleanTag); + } }); return cleanTagsArray; } @@ -36,20 +37,26 @@ export let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[]):st export let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){ let done = plugins.q.defer(); let sortedArray:Dockerfile[] = []; + let trackingArray:Dockerfile[] = []; let sorterFunctionCounter:number = 0; + console.log(sortableArrayArg); + console.log(sortedArray); let sorterFunction = function(){ + plugins.beautylog.log("++++++++++++++++++++++++++++++++++++++++++++++"); console.log(sorterFunctionCounter); - let cleanTags = cleanTagsArrayFunction(sortableArrayArg); sortableArrayArg.forEach((dockerfileArg)=>{ - if(cleanTags.indexOf(dockerfileArg.baseImage) == -1){ - let dockerfileArgIndex = sortableArrayArg.indexOf(dockerfileArg); - sortableArrayArg.splice(dockerfileArgIndex,1); + console.log(dockerfileArg); + let cleanTags = cleanTagsArrayFunction(sortableArrayArg,trackingArray); + console.log(cleanTags); + if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && trackingArray.indexOf(dockerfileArg) == -1){ sortedArray.push(dockerfileArg); + trackingArray.push(dockerfileArg); } }); - if(sortableArrayArg.length == 0){ + plugins.beautylog.info(sortedArray.length.toString()); + if(sortableArrayArg.length == sortedArray.length){ done.resolve(sortedArray); - } else if (sorterFunctionCounter < 100) { + } else if (sorterFunctionCounter < 10) { sorterFunctionCounter++; sorterFunction(); };