From cb7cb852ea1bce254115040a93a98d19eb68d67a Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 5 Jun 2016 10:11:01 +0200 Subject: [PATCH] now sorting Dockerfiles correctly --- dist/npmci.build.docker.js | 46 +++++++++++++------------------------- dist/npmci.env.js | 4 +--- ts/npmci.build.docker.ts | 41 ++++++++++++--------------------- ts/npmci.env.ts | 2 -- 4 files changed, 30 insertions(+), 63 deletions(-) diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index 3ece2e3..323d504 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -24,40 +24,24 @@ var readDockerfiles = function () { }; var sortDockerfiles = function () { var done = plugins.q.defer(); - var redoSort; - var sortCounter = 0; - var sortFunction = function () { - redoSort = false; - var notYetBuiltImages = []; - NpmciEnv.dockerFiles.forEach(function (dockerFileArg) { - notYetBuiltImages.push(dockerFileArg.cleanTag); + NpmciEnv.dockerFiles.sort(function (a, b) { + var 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); - var 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(); + var aIndex = cleanTags.indexOf(a.cleanTag); + var 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; }; var buildDockerfiles = function () { @@ -136,4 +120,4 @@ exports.dockerTag = function (repoArg, versionArg) { return tagString; }; -//# 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\n\nexport let build = function(){\n    let done = plugins.q.defer();\n    plugins.gulp.src(\"./Dockerfile*\")\n        .pipe(readDockerfiles())\n        .pipe(plugins.gulpFunction(function(){\n            sortDockerfiles()\n                .then(buildDockerfiles)\n                .then(done.resolve);\n        },\"atEnd\"));\n    return done.promise;\n}\n\nlet readDockerfiles = function(){\n    return plugins.through2.obj(function(file,enc,cb){\n        let myDockerfile = new Dockerfile({\n            filePath:file.path,\n            read:true\n        });\n        NpmciEnv.dockerFiles.push(\n            myDockerfile\n        );\n        cb(null,file);\n    });\n}\n\nlet sortDockerfiles = function(){\n    let done = plugins.q.defer();\n    let redoSort:boolean;\n    let sortCounter:number = 0;\n    let sortFunction = function(){\n        redoSort = false;\n        let notYetBuiltImages:string[] = [];\n        NpmciEnv.dockerFiles.forEach((dockerFileArg)=>{\n            notYetBuiltImages.push(dockerFileArg.cleanTag);\n        });\n        NpmciEnv.dockerFiles.sort(function(a,b){\n            console.log(\"iteration: \" + sortCounter.toString());\n            console.log(notYetBuiltImages)\n            console.log(a.cleanTag);\n            let aIndex = notYetBuiltImages.indexOf(a.cleanTag);\n            if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}\n            console.log(notYetBuiltImages);\n            if(notYetBuiltImages.indexOf(b.baseImage) != -1){\n                redoSort = true;\n                return -1;\n            } else {\n                return 0\n            }\n        });\n        if(redoSort && sortCounter <= 50){\n            sortCounter++;\n            sortFunction();\n        } else {\n            done.resolve();\n        }\n    };\n    sortFunction();\n    return done.promise;\n}\n\nlet 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\nlet 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\nlet 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 == \"test\"){\n        registry = \"registry.gitlab.com\";\n    } \n    let repo = repoArg;\n    let version = versionArg;\n    if(process.env.CI_BUILD_STAGE == \"test\" || process.env.CI_BUILD_STAGE == \"build\"){\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":";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;IAC7B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC;SAC5B,IAAI,CAAC,eAAe,EAAE,CAAC;SACvB,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;QACvB,eAAe,EAAE;aACZ,IAAI,CAAC,gBAAgB,CAAC;aACtB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC,EAAC,OAAO,CAAC,CAAC,CAAC;IAChB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAA;AAED,IAAI,eAAe,GAAG;IAClB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAS,IAAI,EAAC,GAAG,EAAC,EAAE;QAC5C,IAAI,YAAY,GAAG,IAAI,UAAU,CAAC;YAC9B,QAAQ,EAAC,IAAI,CAAC,IAAI;YAClB,IAAI,EAAC,IAAI;SACZ,CAAC,CAAC;QACH,QAAQ,CAAC,WAAW,CAAC,IAAI,CACrB,YAAY,CACf,CAAC;QACF,EAAE,CAAC,IAAI,EAAC,IAAI,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC,CAAA;AAED,IAAI,eAAe,GAAG;IAClB,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,UAAS,CAAC,EAAC,CAAC;QAClC,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,UAAS,aAAa;YAC/C,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACxB,EAAE,CAAA,CAAC,MAAM,GAAG,MAAM,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA,CAAC;YAChC,MAAM,CAAC,CAAC,CAAC,CAAC;QACd,CAAC;QAAC,IAAI,CAAC,CAAC;YACJ,MAAM,CAAC,CAAC,CAAA;QACZ,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,EAAE,CAAC;IACf,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AACxB,CAAC,CAAA;AAED,IAAI,gBAAgB,GAAG;IACnB,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,iBAAiB,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,eAAe,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;AAED,IAAI,iBAAiB,GAAG,UAAS,iBAAwB;IACrD,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;AAED,IAAI,eAAe,GAAG,UAAS,oBAA2B;IACtD,IAAI,cAAc,GAAG,8BAA8B,CAAA;IACnD,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,MAAM,CAAC,CAAA,CAAC;QACrC,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,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,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    plugins.gulp.src(\"./Dockerfile*\")\n        .pipe(readDockerfiles())\n        .pipe(plugins.gulpFunction(function(){\n            sortDockerfiles()\n                .then(buildDockerfiles)\n                .then(done.resolve);\n        },\"atEnd\"));\n    return done.promise;\n}\n\nlet readDockerfiles = function(){\n    return plugins.through2.obj(function(file,enc,cb){\n        let myDockerfile = new Dockerfile({\n            filePath:file.path,\n            read:true\n        });\n        NpmciEnv.dockerFiles.push(\n            myDockerfile\n        );\n        cb(null,file);\n    });\n}\n\nlet sortDockerfiles = function(){\n    let done = plugins.q.defer();\n    NpmciEnv.dockerFiles.sort(function(a,b){\n        let cleanTags = [];\n        NpmciEnv.dockerFiles.forEach(function(dockerfileArg){\n            cleanTags.push(dockerfileArg.cleanTag);\n        });\n        let aIndex = cleanTags.indexOf(a.cleanTag);\n        let bIndex = cleanTags.indexOf(b.baseImage);\n        console.log(cleanTags);\n        console.log(a.cleanTag);\n        console.log(b.cleanTag);\n        if(bIndex < aIndex && bIndex != -1){\n            return -1;\n        } else {\n            return 0\n        }\n    });\n    done.resolve();\n    return done.promise;\n}\n\nlet 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\nlet 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\nlet 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 == \"test\"){\n        registry = \"registry.gitlab.com\";\n    } \n    let repo = repoArg;\n    let version = versionArg;\n    if(process.env.CI_BUILD_STAGE == \"test\" || process.env.CI_BUILD_STAGE == \"build\"){\n        version = version + \"_test\";\n    }\n    tagString = registry + \"/\" + repo + \":\" + version;\n    return tagString;\n};\n"]} diff --git a/dist/npmci.env.js b/dist/npmci.env.js index 8ec086e..0f2ee64 100644 --- a/dist/npmci.env.js +++ b/dist/npmci.env.js @@ -2,9 +2,7 @@ require("typings-global"); var smartstring_1 = require("smartstring"); exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO); -console.log(process.env.CI_BUILD_REPO); -console.log(exports.repo); exports.dockerFilesBuilt = []; exports.dockerFiles = []; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDekQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQ3ZDLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBSSxDQUFDLENBQUM7QUFLUCx3QkFBZ0IsR0FBZ0IsRUFBRSxDQUFDO0FBQ25DLG1CQUFXLEdBQWdCLEVBQUUsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XG5pbXBvcnQge0dpdFJlcG99IGZyb20gXCJzbWFydHN0cmluZ1wiO1xuaW1wb3J0IHtEb2NrZXJmaWxlfSBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxuXG5leHBvcnQgbGV0IHJlcG8gPSBuZXcgR2l0UmVwbyhwcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPKTtcbmNvbnNvbGUubG9nKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xuY29uc29sZS5sb2cocmVwbyk7XG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xuZXhwb3J0IGxldCBkb2NrZXJSZWxlYXNlVGFnOnN0cmluZztcblxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xuZXhwb3J0IGxldCBkb2NrZXJGaWxlczpEb2NrZXJmaWxlW10gPSBbXTtcblxuIl19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFLOUMsd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcbmltcG9ydCB7RG9ja2VyZmlsZX0gZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcblxuZXhwb3J0IGxldCByZXBvID0gbmV3IEdpdFJlcG8ocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTyk7XG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xuZXhwb3J0IGxldCBkb2NrZXJSZWxlYXNlVGFnOnN0cmluZztcblxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xuZXhwb3J0IGxldCBkb2NrZXJGaWxlczpEb2NrZXJmaWxlW10gPSBbXTtcblxuIl19 diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index deb3b4f..dfa0594 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -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; } diff --git a/ts/npmci.env.ts b/ts/npmci.env.ts index c6f4fc5..c6e7500 100644 --- a/ts/npmci.env.ts +++ b/ts/npmci.env.ts @@ -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;