diff --git a/dist/npmci.build.docker.d.ts b/dist/npmci.build.docker.d.ts index 9d82074..58e1106 100644 --- a/dist/npmci.build.docker.d.ts +++ b/dist/npmci.build.docker.d.ts @@ -1,4 +1,8 @@ export declare let build: () => any; +export declare let readDockerfiles: () => any; +export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[]) => string[]; +export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => any; +export declare let buildDockerfiles: () => any; export declare class Dockerfile { filePath: string; repo: string; @@ -15,4 +19,6 @@ export declare class Dockerfile { build(): void; push(): void; } +export declare let dockerFileVersion: (dockerfileNameArg: string) => string; +export declare let dockerBaseImage: (dockerfileContentArg: string) => string; export declare let dockerTag: (repoArg: string, versionArg: string) => string; diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index 7601551..07376ab 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -3,50 +3,47 @@ var plugins = require("./npmci.plugins"); var NpmciEnv = require("./npmci.env"); exports.build = function () { var done = plugins.q.defer(); - plugins.gulp.src("./Dockerfile*") - .pipe(readDockerfiles()) - .pipe(plugins.gulpFunction(function () { - sortDockerfiles() - .then(buildDockerfiles) - .then(done.resolve); - }, "atEnd")); return done.promise; }; -var readDockerfiles = function () { - return plugins.through2.obj(function (file, enc, cb) { +exports.readDockerfiles = function () { + var done = plugins.q.defer(); + var readDockerfilesArray = []; + plugins.gulp.src("./Dockerfile*") + .pipe(plugins.through2.obj(function (file, enc, cb) { var myDockerfile = new Dockerfile({ filePath: file.path, read: true }); - NpmciEnv.dockerFiles.push(myDockerfile); + readDockerfilesArray.push(myDockerfile); cb(null, file); - }); + }, function () { + done.resolve(readDockerfilesArray); + })); + return done.promise; }; -var cleanTagsArrayFunction = function () { +exports.cleanTagsArrayFunction = function (dockerfileArrayArg) { var cleanTagsArray = []; - NpmciEnv.dockerFiles.forEach(function (dockerfileArg) { + dockerfileArrayArg.forEach(function (dockerfileArg) { cleanTagsArray.push(dockerfileArg.cleanTag); }); return cleanTagsArray; }; -var sortDockerfiles = function () { +exports.sortDockerfiles = function (sortableArrayArg) { var done = plugins.q.defer(); - var sortableArray = NpmciEnv.dockerFiles; var sortedArray = []; var sorterFunctionCounter = 0; var sorterFunction = function () { - var cleanTags = cleanTagsArrayFunction(); - sortableArray.forEach(function (dockerfileArg) { + console.log(sorterFunctionCounter); + var cleanTags = exports.cleanTagsArrayFunction(sortableArrayArg); + sortableArrayArg.forEach(function (dockerfileArg) { if (cleanTags.indexOf(dockerfileArg.baseImage) == -1) { - var dockerfileArgIndex = sortableArray.indexOf(dockerfileArg); - sortableArray.splice(dockerfileArgIndex); + var dockerfileArgIndex = sortableArrayArg.indexOf(dockerfileArg); + sortableArrayArg.splice(dockerfileArgIndex, 1); sortedArray.push(dockerfileArg); } }); - if (sortableArray.length == 0) { - console.log(sortedArray); - NpmciEnv.dockerFiles = sortedArray; - done.resolve(); + if (sortableArrayArg.length == 0) { + done.resolve(sortedArray); } else if (sorterFunctionCounter < 100) { sorterFunctionCounter++; @@ -57,7 +54,7 @@ var sortDockerfiles = function () { sorterFunction(); return done.promise; }; -var buildDockerfiles = function () { +exports.buildDockerfiles = function () { var done = plugins.q.defer(); NpmciEnv.dockerFiles.forEach(function (dockerfileArg) { dockerfileArg.build(); @@ -69,13 +66,13 @@ var Dockerfile = (function () { function Dockerfile(options) { this.filePath = options.filePath; this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo; - this.version = dockerFileVersion(plugins.path.parse(options.filePath).base); + this.version = exports.dockerFileVersion(plugins.path.parse(options.filePath).base); this.cleanTag = this.repo + ":" + this.version; if (options.filePath && options.read) { this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath)); } ; - this.baseImage = dockerBaseImage(this.content); + this.baseImage = exports.dockerBaseImage(this.content); } ; Dockerfile.prototype.build = function () { @@ -101,7 +98,7 @@ var Dockerfile = (function () { return Dockerfile; }()); exports.Dockerfile = Dockerfile; -var dockerFileVersion = function (dockerfileNameArg) { +exports.dockerFileVersion = function (dockerfileNameArg) { var versionString; var versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; var regexResultArray = versionRegex.exec(dockerfileNameArg); @@ -113,8 +110,8 @@ var dockerFileVersion = function (dockerfileNameArg) { } return versionString; }; -var dockerBaseImage = function (dockerfileContentArg) { - var baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n/; +exports.dockerBaseImage = function (dockerfileContentArg) { + var baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/; var regexResultArray = baseImageRegex.exec(dockerfileContentArg); return regexResultArray[1]; }; @@ -133,4 +130,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 cleanTagsArrayFunction = function(){\n    let cleanTagsArray = [];\n    NpmciEnv.dockerFiles.forEach(function(dockerfileArg){\n        cleanTagsArray.push(dockerfileArg.cleanTag);\n    });\n    return cleanTagsArray;\n}\n\nlet sortDockerfiles = function(){\n    let done = plugins.q.defer();\n    let sortableArray = NpmciEnv.dockerFiles;\n    let sortedArray:Dockerfile[] = []; \n    let sorterFunctionCounter:number = 0;\n    let sorterFunction = function(){\n        let cleanTags = cleanTagsArrayFunction();\n        sortableArray.forEach((dockerfileArg)=>{\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1){\n                let dockerfileArgIndex = sortableArray.indexOf(dockerfileArg);\n                sortableArray.splice(dockerfileArgIndex);\n                sortedArray.push(dockerfileArg);\n            }\n        });\n        if(sortableArray.length == 0){\n            console.log(sortedArray);\n            NpmciEnv.dockerFiles = sortedArray;\n            done.resolve();\n        } else if (sorterFunctionCounter < 100) {\n            sorterFunctionCounter++;\n            sorterFunction();\n        };\n    }\n    sorterFunction();\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 == \"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\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"]} diff --git a/package.json b/package.json index 258ef4a..9e3b934 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ }, "homepage": "https://gitlab.com/pushrocks/npmci#README", "devDependencies": { - "npmts": "^5.2.1" + "npmts": "^5.2.1", + "should": "^9.0.0", + "typings-test": "^1.0.1" }, "dependencies": { "beautylog": "^5.0.8", diff --git a/test/assets/Dockerfile b/test/assets/Dockerfile new file mode 100644 index 0000000..7999edc --- /dev/null +++ b/test/assets/Dockerfile @@ -0,0 +1,2 @@ +FROM ubuntu +RUN apt-get update diff --git a/test/assets/Dockerfile_sometag1 b/test/assets/Dockerfile_sometag1 new file mode 100644 index 0000000..9234e6a --- /dev/null +++ b/test/assets/Dockerfile_sometag1 @@ -0,0 +1,2 @@ +FROM myrepo/mygroup:sometag2 +RUN apt-get update \ No newline at end of file diff --git a/test/assets/Dockerfile_sometag2 b/test/assets/Dockerfile_sometag2 new file mode 100644 index 0000000..2a63922 --- /dev/null +++ b/test/assets/Dockerfile_sometag2 @@ -0,0 +1 @@ +FROM mygroup/myrepo:latest \ No newline at end of file diff --git a/test/test.d.ts b/test/test.d.ts new file mode 100644 index 0000000..b973566 --- /dev/null +++ b/test/test.d.ts @@ -0,0 +1,2 @@ +import "typings-test"; +import "should"; diff --git a/test/test.js b/test/test.js new file mode 100644 index 0000000..34603b4 --- /dev/null +++ b/test/test.js @@ -0,0 +1,41 @@ +"use strict"; +require("typings-test"); +require("should"); +var path = require("path"); +//set up environment +process.env.CI_BUILD_REPO = "https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git"; +process.cwd = function () { + return path.join(__dirname, "assets/"); +}; +//require NPMCI files +var NpmciBuildDocker = require("../dist/npmci.build.docker"); +var dockerfile1; +var dockerfile2; +var sortableArray; +describe("NPMCI", function () { + describe("build.docker", function () { + it("should return valid Dockerfiles", function () { + dockerfile1 = new NpmciBuildDocker.Dockerfile({ filePath: "./Dockerfile", read: true }); + dockerfile2 = new NpmciBuildDocker.Dockerfile({ filePath: "./Dockerfile_sometag1", read: true }); + dockerfile1.version.should.equal("latest"); + dockerfile2.version.should.equal("sometag1"); + }); + it("should read a directory of Dockerfiles", function (done) { + NpmciBuildDocker.readDockerfiles() + .then(function (readDockerfilesArrayArg) { + readDockerfilesArrayArg[1].version.should.equal("sometag1"); + sortableArray = readDockerfilesArrayArg; + done(); + }); + }); + it("should sort an array of Dockerfiles", function (done) { + NpmciBuildDocker.sortDockerfiles(sortableArray) + .then(function (sortedArrayArg) { + console.log(sortedArrayArg); + done(); + }); + }); + }); +}); + +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUNoQixJQUFPLElBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUM5QixvQkFBb0I7QUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEdBQUcsdURBQXVELENBQUM7QUFDcEYsT0FBTyxDQUFDLEdBQUcsR0FBRztJQUNWLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxTQUFTLENBQUMsQ0FBQztBQUMxQyxDQUFDLENBQUM7QUFFRixxQkFBcUI7QUFDckIsSUFBTyxnQkFBZ0IsV0FBVyw0QkFBNEIsQ0FBQyxDQUFDO0FBR2hFLElBQUksV0FBdUMsQ0FBQztBQUM1QyxJQUFJLFdBQXVDLENBQUM7QUFDNUMsSUFBSSxhQUEyQyxDQUFDO0FBRWhELFFBQVEsQ0FBQyxPQUFPLEVBQUM7SUFDYixRQUFRLENBQUMsY0FBYyxFQUFDO1FBQ3BCLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBQztZQUNqQyxXQUFXLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsRUFBQyxRQUFRLEVBQUMsY0FBYyxFQUFDLElBQUksRUFBQyxJQUFJLEVBQUMsQ0FBQyxDQUFDO1lBQ25GLFdBQVcsR0FBRyxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFDLFFBQVEsRUFBQyx1QkFBdUIsRUFBQyxJQUFJLEVBQUMsSUFBSSxFQUFDLENBQUMsQ0FBQztZQUM1RixXQUFXLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDM0MsV0FBVyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLHdDQUF3QyxFQUFDLFVBQVMsSUFBSTtZQUNyRCxnQkFBZ0IsQ0FBQyxlQUFlLEVBQUU7aUJBQzdCLElBQUksQ0FBQyxVQUFTLHVCQUFxRDtnQkFDaEUsdUJBQXVCLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7Z0JBQzVELGFBQWEsR0FBRyx1QkFBdUIsQ0FBQTtnQkFDdkMsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFBO1FBQ0YsRUFBRSxDQUFDLHFDQUFxQyxFQUFDLFVBQVMsSUFBSTtZQUNsRCxnQkFBZ0IsQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDO2lCQUMxQyxJQUFJLENBQUMsVUFBUyxjQUE0QztnQkFDdkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztnQkFDNUIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy10ZXN0XCI7XG5pbXBvcnQgXCJzaG91bGRcIjtcbmltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XG4vL3NldCB1cCBlbnZpcm9ubWVudFxucHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTyA9IFwiaHR0cHM6Ly95eXl5eXk6eHh4eHh4eHhAZ2l0bGFiLmNvbS9teWdyb3VwL215cmVwby5naXRcIjtcbnByb2Nlc3MuY3dkID0gKCkgPT4ge1xuICAgIHJldHVybiBwYXRoLmpvaW4oX19kaXJuYW1lLFwiYXNzZXRzL1wiKTtcbn07XG5cbi8vcmVxdWlyZSBOUE1DSSBmaWxlc1xuaW1wb3J0IE5wbWNpQnVpbGREb2NrZXIgPSByZXF1aXJlKFwiLi4vZGlzdC9ucG1jaS5idWlsZC5kb2NrZXJcIik7XG5cblxubGV0IGRvY2tlcmZpbGUxOk5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZTtcbmxldCBkb2NrZXJmaWxlMjpOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGU7XG5sZXQgc29ydGFibGVBcnJheTpOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGVbXTtcblxuZGVzY3JpYmUoXCJOUE1DSVwiLGZ1bmN0aW9uKCl7XG4gICAgZGVzY3JpYmUoXCJidWlsZC5kb2NrZXJcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCByZXR1cm4gdmFsaWQgRG9ja2VyZmlsZXNcIixmdW5jdGlvbigpe1xuICAgICAgICAgICAgZG9ja2VyZmlsZTEgPSBuZXcgTnBtY2lCdWlsZERvY2tlci5Eb2NrZXJmaWxlKHtmaWxlUGF0aDpcIi4vRG9ja2VyZmlsZVwiLHJlYWQ6dHJ1ZX0pO1xuICAgICAgICAgICAgZG9ja2VyZmlsZTIgPSBuZXcgTnBtY2lCdWlsZERvY2tlci5Eb2NrZXJmaWxlKHtmaWxlUGF0aDpcIi4vRG9ja2VyZmlsZV9zb21ldGFnMVwiLHJlYWQ6dHJ1ZX0pO1xuICAgICAgICAgICAgZG9ja2VyZmlsZTEudmVyc2lvbi5zaG91bGQuZXF1YWwoXCJsYXRlc3RcIik7XG4gICAgICAgICAgICBkb2NrZXJmaWxlMi52ZXJzaW9uLnNob3VsZC5lcXVhbChcInNvbWV0YWcxXCIpO1xuICAgICAgICB9KTtcbiAgICAgICAgaXQoXCJzaG91bGQgcmVhZCBhIGRpcmVjdG9yeSBvZiBEb2NrZXJmaWxlc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgTnBtY2lCdWlsZERvY2tlci5yZWFkRG9ja2VyZmlsZXMoKVxuICAgICAgICAgICAgICAgIC50aGVuKGZ1bmN0aW9uKHJlYWREb2NrZXJmaWxlc0FycmF5QXJnOk5wbWNpQnVpbGREb2NrZXIuRG9ja2VyZmlsZVtdKXtcbiAgICAgICAgICAgICAgICAgICAgcmVhZERvY2tlcmZpbGVzQXJyYXlBcmdbMV0udmVyc2lvbi5zaG91bGQuZXF1YWwoXCJzb21ldGFnMVwiKTtcbiAgICAgICAgICAgICAgICAgICAgc29ydGFibGVBcnJheSA9IHJlYWREb2NrZXJmaWxlc0FycmF5QXJnXG4gICAgICAgICAgICAgICAgICAgIGRvbmUoKTtcbiAgICAgICAgICAgICAgICB9KTtcbiAgICAgICAgfSlcbiAgICAgICAgaXQoXCJzaG91bGQgc29ydCBhbiBhcnJheSBvZiBEb2NrZXJmaWxlc1wiLGZ1bmN0aW9uKGRvbmUpe1xuICAgICAgICAgICAgTnBtY2lCdWlsZERvY2tlci5zb3J0RG9ja2VyZmlsZXMoc29ydGFibGVBcnJheSlcbiAgICAgICAgICAgICAgICAudGhlbihmdW5jdGlvbihzb3J0ZWRBcnJheUFyZzpOcG1jaUJ1aWxkRG9ja2VyLkRvY2tlcmZpbGVbXSl7XG4gICAgICAgICAgICAgICAgICAgIGNvbnNvbGUubG9nKHNvcnRlZEFycmF5QXJnKTtcbiAgICAgICAgICAgICAgICAgICAgZG9uZSgpO1xuICAgICAgICAgICAgICAgIH0pXG4gICAgICAgIH0pXG4gICAgfSlcbn0pIl19 diff --git a/test/test.ts b/test/test.ts new file mode 100644 index 0000000..ebc1f8f --- /dev/null +++ b/test/test.ts @@ -0,0 +1,42 @@ +import "typings-test"; +import "should"; +import path = require("path"); +//set up environment +process.env.CI_BUILD_REPO = "https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git"; +process.cwd = () => { + return path.join(__dirname,"assets/"); +}; + +//require NPMCI files +import NpmciBuildDocker = require("../dist/npmci.build.docker"); + + +let dockerfile1:NpmciBuildDocker.Dockerfile; +let dockerfile2:NpmciBuildDocker.Dockerfile; +let sortableArray:NpmciBuildDocker.Dockerfile[]; + +describe("NPMCI",function(){ + describe("build.docker",function(){ + it("should return valid Dockerfiles",function(){ + dockerfile1 = new NpmciBuildDocker.Dockerfile({filePath:"./Dockerfile",read:true}); + dockerfile2 = new NpmciBuildDocker.Dockerfile({filePath:"./Dockerfile_sometag1",read:true}); + dockerfile1.version.should.equal("latest"); + dockerfile2.version.should.equal("sometag1"); + }); + it("should read a directory of Dockerfiles",function(done){ + NpmciBuildDocker.readDockerfiles() + .then(function(readDockerfilesArrayArg:NpmciBuildDocker.Dockerfile[]){ + readDockerfilesArrayArg[1].version.should.equal("sometag1"); + sortableArray = readDockerfilesArrayArg + done(); + }); + }) + it("should sort an array of Dockerfiles",function(done){ + NpmciBuildDocker.sortDockerfiles(sortableArray) + .then(function(sortedArrayArg:NpmciBuildDocker.Dockerfile[]){ + console.log(sortedArrayArg); + done(); + }) + }) + }) +}) \ No newline at end of file diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index 1850285..2658790 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -4,55 +4,51 @@ import * as NpmciEnv from "./npmci.env"; export let build = function(){ let done = plugins.q.defer(); - plugins.gulp.src("./Dockerfile*") - .pipe(readDockerfiles()) - .pipe(plugins.gulpFunction(function(){ - sortDockerfiles() - .then(buildDockerfiles) - .then(done.resolve); - },"atEnd")); + return done.promise; } -let readDockerfiles = function(){ - return plugins.through2.obj(function(file,enc,cb){ - let myDockerfile = new Dockerfile({ - filePath:file.path, - read:true - }); - NpmciEnv.dockerFiles.push( - myDockerfile - ); - cb(null,file); - }); +export let readDockerfiles = function(){ + let done = plugins.q.defer(); + let readDockerfilesArray:Dockerfile[] = [] + plugins.gulp.src("./Dockerfile*") + .pipe(plugins.through2.obj(function(file,enc,cb){ + let myDockerfile = new Dockerfile({ + filePath:file.path, + read:true + }); + readDockerfilesArray.push(myDockerfile); + cb(null,file); + },function(){ + done.resolve(readDockerfilesArray); + })); + return done.promise; } -let cleanTagsArrayFunction = function(){ - let cleanTagsArray = []; - NpmciEnv.dockerFiles.forEach(function(dockerfileArg){ +export let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[]):string[]{ + let cleanTagsArray:string[] = []; + dockerfileArrayArg.forEach(function(dockerfileArg){ cleanTagsArray.push(dockerfileArg.cleanTag); }); return cleanTagsArray; } -let sortDockerfiles = function(){ +export let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){ let done = plugins.q.defer(); - let sortableArray = NpmciEnv.dockerFiles; let sortedArray:Dockerfile[] = []; let sorterFunctionCounter:number = 0; let sorterFunction = function(){ - let cleanTags = cleanTagsArrayFunction(); - sortableArray.forEach((dockerfileArg)=>{ + console.log(sorterFunctionCounter); + let cleanTags = cleanTagsArrayFunction(sortableArrayArg); + sortableArrayArg.forEach((dockerfileArg)=>{ if(cleanTags.indexOf(dockerfileArg.baseImage) == -1){ - let dockerfileArgIndex = sortableArray.indexOf(dockerfileArg); - sortableArray.splice(dockerfileArgIndex); + let dockerfileArgIndex = sortableArrayArg.indexOf(dockerfileArg); + sortableArrayArg.splice(dockerfileArgIndex,1); sortedArray.push(dockerfileArg); } }); - if(sortableArray.length == 0){ - console.log(sortedArray); - NpmciEnv.dockerFiles = sortedArray; - done.resolve(); + if(sortableArrayArg.length == 0){ + done.resolve(sortedArray); } else if (sorterFunctionCounter < 100) { sorterFunctionCounter++; sorterFunction(); @@ -62,7 +58,7 @@ let sortDockerfiles = function(){ return done.promise; } -let buildDockerfiles = function(){ +export let buildDockerfiles = function(){ let done = plugins.q.defer(); NpmciEnv.dockerFiles.forEach(function(dockerfileArg){ dockerfileArg.build(); @@ -109,7 +105,7 @@ export class Dockerfile { } } -let dockerFileVersion = function(dockerfileNameArg:string):string{ +export let dockerFileVersion = function(dockerfileNameArg:string):string{ let versionString:string; let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; let regexResultArray = versionRegex.exec(dockerfileNameArg); @@ -121,8 +117,8 @@ let dockerFileVersion = function(dockerfileNameArg:string):string{ return versionString; } -let dockerBaseImage = function(dockerfileContentArg:string){ - let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n/ +export let dockerBaseImage = function(dockerfileContentArg:string){ + let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/ let regexResultArray = baseImageRegex.exec(dockerfileContentArg) return regexResultArray[1]; }