From 2f827a76962000385c60995ab0c61528e609a50f Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Tue, 7 Jun 2016 19:41:14 +0200 Subject: [PATCH] fix tagging logic --- dist/npmci.build.docker.d.ts | 17 +++---- dist/npmci.build.docker.js | 86 ++++++++++++----------------------- ts/npmci.build.docker.ts | 87 +++++++++++------------------------- 3 files changed, 60 insertions(+), 130 deletions(-) diff --git a/dist/npmci.build.docker.d.ts b/dist/npmci.build.docker.d.ts index 8370aa1..1503d1e 100644 --- a/dist/npmci.build.docker.d.ts +++ b/dist/npmci.build.docker.d.ts @@ -3,20 +3,20 @@ export declare let readDockerfiles: () => any; export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => any; export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => any; export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => any; -export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => any; -export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[]) => any; +export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[], regsitryArg?: string) => any; +export declare let pullDockerfileImages: (sortableArrayArg: Dockerfile[], registryArg?: string) => any; export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => any; -export declare let releaseDockerfiles: (sortedArrayArg: Dockerfile[]) => any; +export declare let releaseDockerfiles: (sortedArrayArg: Dockerfile[], registryArg?: any) => any; export declare class Dockerfile { filePath: string; repo: string; version: string; cleanTag: string; buildTag: string; + testTag: string; releaseTag: string; containerName: string; content: string; - patchedContent: string; baseImage: string; localBaseImageDependent: boolean; localBaseDockerfile: Dockerfile; @@ -26,15 +26,12 @@ export declare class Dockerfile { read?: boolean; }); build(): any; - push(): any; - pull(): void; + push(registryArg: string): any; + pull(registryArg: string): void; test(): void; - release(): void; getId(): string; - patchContents(): any; - restoreContents(): any; } export declare let dockerFileVersion: (dockerfileNameArg: string) => string; export declare let dockerBaseImage: (dockerfileContentArg: string) => string; -export declare let dockerTag: (repoArg: string, versionArg: string, stageArg: string) => string; +export declare let dockerTag: (registryArg: string, repoArg: string, versionArg: string, suffixArg?: string) => string; export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[]; diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index 4c157be..5cd1536 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -83,18 +83,20 @@ exports.buildDockerfiles = function (sortedArrayArg) { done.resolve(sortedArrayArg); return done.promise; }; -exports.pushDockerfiles = function (sortedArrayArg) { +exports.pushDockerfiles = function (sortedArrayArg, regsitryArg) { + if (regsitryArg === void 0) { regsitryArg = "registry.gitlab.com"; } var done = plugins.q.defer(); sortedArrayArg.forEach(function (dockerfileArg) { - dockerfileArg.push(); + dockerfileArg.push(regsitryArg); }); done.resolve(sortedArrayArg); return done.promise; }; -exports.pullDockerfileImages = function (sortableArrayArg) { +exports.pullDockerfileImages = function (sortableArrayArg, registryArg) { + if (registryArg === void 0) { registryArg = "registry.gitlab.com"; } var done = plugins.q.defer(); sortableArrayArg.forEach(function (dockerfileArg) { - dockerfileArg.pull(); + dockerfileArg.pull(registryArg); }); done.resolve(sortableArrayArg); return done.promise; @@ -107,10 +109,11 @@ exports.testDockerfiles = function (sortedArrayArg) { done.resolve(sortedArrayArg); return done.promise; }; -exports.releaseDockerfiles = function (sortedArrayArg) { +exports.releaseDockerfiles = function (sortedArrayArg, registryArg) { + if (registryArg === void 0) { registryArg = NpmciEnv.dockerRegistry; } var done = plugins.q.defer(); sortedArrayArg.forEach(function (dockerfileArg) { - dockerfileArg.release(); + dockerfileArg.push(registryArg); }); done.resolve(sortedArrayArg); return done.promise; @@ -121,8 +124,9 @@ var Dockerfile = (function () { this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo; this.version = exports.dockerFileVersion(plugins.path.parse(options.filePath).base); this.cleanTag = this.repo + ":" + this.version; - this.buildTag = exports.dockerTag(this.repo, this.version, "build"); - this.releaseTag = exports.dockerTag(this.repo, this.version, "release"); + this.buildTag = this.cleanTag; + this.testTag = exports.dockerTag("registry.gitlab.com", this.repo, this.version, "test"); + this.releaseTag = exports.dockerTag(NpmciEnv.dockerRegistry, this.repo, this.version); this.containerName = "dockerfile-" + this.version; if (options.filePath && options.read) { this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath)); @@ -133,29 +137,27 @@ var Dockerfile = (function () { } ; Dockerfile.prototype.build = function () { - plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); var done = plugins.q.defer(); - this.patchContents(); + plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); npmci_bash_1.bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " ."); NpmciEnv.dockerFilesBuilt.push(this); - this.restoreContents(); done.resolve(); return done.promise; }; ; - Dockerfile.prototype.push = function () { + Dockerfile.prototype.push = function (registryArg) { var done = plugins.q.defer(); - if (this.buildTag) { - npmci_bash_1.bashBare("docker push " + this.buildTag); - } - else { - plugins.beautylog.error("Dockerfile hasn't been built yet!"); - } + var pushTag; + NpmciEnv.buildStage == "test" ? pushTag = this.testTag : pushTag = this.releaseTag; + npmci_bash_1.bashBare("docker tag " + this.buildTag + " " + pushTag); + npmci_bash_1.bashBare("docker push " + pushTag); done.resolve(); return done.promise; }; - Dockerfile.prototype.pull = function () { - npmci_bash_1.bashBare("docker pull " + this.buildTag); + Dockerfile.prototype.pull = function (registryArg) { + var pullTag = this.testTag; + npmci_bash_1.bashBare("docker pull " + pullTag); + npmci_bash_1.bashBare("docker tag " + pullTag + " " + this.buildTag); }; ; Dockerfile.prototype.test = function () { @@ -174,41 +176,11 @@ var Dockerfile = (function () { } }; ; - Dockerfile.prototype.release = function () { - npmci_bash_1.bashBare("docker tag " + this.buildTag + " " + this.releaseTag); - npmci_bash_1.bashBare("docker push " + this.releaseTag); - }; Dockerfile.prototype.getId = function () { var containerId = npmci_bash_1.bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag); return containerId; }; ; - Dockerfile.prototype.patchContents = function () { - var done = plugins.q.defer(); - if (this.localBaseImageDependent == true) { - plugins.beautylog.info("patching Dockerfile due to local build dependency!"); - this.patchedContent = this.content.replace(/FROM\s[a-zA-Z0-9\/\-\:]*/, 'FROM ' + this.localBaseDockerfile.buildTag); - plugins.smartfile.memory.toFsSync(this.patchedContent, { - fileName: plugins.path.parse(this.filePath).name, - filePath: plugins.path.parse(this.filePath).dir - }); - } - done.resolve(); - return done.promise; - }; - ; - Dockerfile.prototype.restoreContents = function () { - var done = plugins.q.defer(); - if (this.localBaseImageDependent == true) { - plugins.smartfile.memory.toFsSync(this.content, { - fileName: plugins.path.parse(this.filePath).name, - filePath: plugins.path.parse(this.filePath).dir - }); - } - done.resolve(); - return done.promise; - }; - ; return Dockerfile; }()); exports.Dockerfile = Dockerfile; @@ -229,17 +201,15 @@ exports.dockerBaseImage = function (dockerfileContentArg) { var regexResultArray = baseImageRegex.exec(dockerfileContentArg); return regexResultArray[1]; }; -exports.dockerTag = function (repoArg, versionArg, stageArg) { +exports.dockerTag = function (registryArg, repoArg, versionArg, suffixArg) { var tagString; - var registry = NpmciEnv.dockerRegistry; - if (stageArg == "build" || stageArg == "test") { - registry = "registry.gitlab.com"; - } + var registry = registryArg; var repo = repoArg; var version = versionArg; - if (stageArg == "build" || stageArg == "test") { - version = version + "_test"; + if (suffixArg) { + version = versionArg + "_" + suffixArg; } + ; tagString = registry + "/" + repo + ":" + version; return tagString; }; @@ -253,4 +223,4 @@ exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) return cleanTagsArray; }; -//# 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\";\r\nimport * as paths from \"./npmci.paths\";\r\nimport * as NpmciEnv from \"./npmci.env\";\r\nimport {bashBare} from \"./npmci.bash\";\r\n\r\nexport let build = function(){\r\n    let done = plugins.q.defer();\r\n    readDockerfiles()\r\n        .then(sortDockerfiles)\r\n        .then(mapDockerfiles)\r\n        .then(buildDockerfiles)\r\n        .then(pushDockerfiles)\r\n        .then(() => {\r\n            done.resolve();\r\n        });\r\n    return done.promise;\r\n}\r\n\r\nexport let readDockerfiles = function(){\r\n    let done = plugins.q.defer();\r\n    let readDockerfilesArray:Dockerfile[] = []\r\n    plugins.gulp.src(\"./Dockerfile*\")\r\n        .pipe(plugins.through2.obj(function(file,enc,cb){\r\n            let myDockerfile = new Dockerfile({\r\n                filePath:file.path,\r\n                read:true\r\n            });\r\n            readDockerfilesArray.push(myDockerfile);\r\n            cb(null,file);\r\n         },function(){\r\n             done.resolve(readDockerfilesArray);\r\n         }));\r\n    return done.promise;\r\n}\r\n\r\nexport let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){\r\n    let done = plugins.q.defer();\r\n    let sortedArray:Dockerfile[] = [];\r\n    let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray);\r\n    let sorterFunctionCounter:number = 0;\r\n    let sorterFunction = function(){\r\n        sortableArrayArg.forEach((dockerfileArg)=>{\r\n            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray);\r\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && sortedArray.indexOf(dockerfileArg) == -1){\r\n                sortedArray.push(dockerfileArg);\r\n            };\r\n            if(cleanTagsOriginal.indexOf(dockerfileArg.baseImage) != -1){\r\n                dockerfileArg.localBaseImageDependent = true;\r\n            };\r\n        });\r\n        if(sortableArrayArg.length == sortedArray.length){\r\n            done.resolve(sortedArray);\r\n        } else if (sorterFunctionCounter < 10) {\r\n            sorterFunctionCounter++;\r\n            sorterFunction();\r\n        };\r\n    }\r\n    sorterFunction();\r\n    return done.promise;\r\n};\r\n\r\nexport let mapDockerfiles = function(sortedArray:Dockerfile[]){\r\n    let done = plugins.q.defer();\r\n    sortedArray.forEach((dockerfileArg) => {\r\n        if(dockerfileArg.localBaseImageDependent){\r\n            sortedArray.forEach((dockfile2:Dockerfile) => {\r\n                if(dockfile2.cleanTag == dockerfileArg.baseImage){\r\n                    dockerfileArg.localBaseDockerfile = dockfile2;\r\n                }\r\n            })\r\n        };\r\n    });\r\n    done.resolve(sortedArray);\r\n    return done.promise;\r\n}\r\n\r\nexport let buildDockerfiles = (sortedArrayArg:Dockerfile[]) => {\r\n    let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.build();\r\n    })\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){\r\n    let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.push();\r\n    });\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport let pullDockerfileImages = (sortableArrayArg:Dockerfile[]) => {\r\n    let done = plugins.q.defer();\r\n    sortableArrayArg.forEach((dockerfileArg) => {\r\n        dockerfileArg.pull();\r\n    });\r\n    done.resolve(sortableArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport let testDockerfiles = (sortedArrayArg:Dockerfile[]) => {\r\n    let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.test();\r\n    });\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n};\r\n\r\nexport let releaseDockerfiles = (sortedArrayArg:Dockerfile[]) => {\r\n     let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.release();\r\n    });\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport class Dockerfile {\r\n    filePath:string;\r\n    repo:string;\r\n    version:string;\r\n    cleanTag:string;\r\n    buildTag:string;\r\n    releaseTag:string;\r\n    containerName:string\r\n    content:string;\r\n    patchedContent:string;\r\n    baseImage:string;\r\n    localBaseImageDependent:boolean;\r\n    localBaseDockerfile:Dockerfile;\r\n    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){\r\n        this.filePath = options.filePath;\r\n        this.repo = NpmciEnv.repo.user + \"/\" + NpmciEnv.repo.repo;\r\n        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);\r\n        this.cleanTag = this.repo + \":\" + this.version;\r\n        this.buildTag = dockerTag(this.repo,this.version,\"build\");\r\n        this.releaseTag = dockerTag(this.repo,this.version,\"release\");\r\n        this.containerName = \"dockerfile-\" + this.version;\r\n        if(options.filePath && options.read){\r\n            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));\r\n        };\r\n        this.baseImage = dockerBaseImage(this.content);\r\n        this.localBaseImageDependent = false;\r\n    };\r\n    build(){\r\n        plugins.beautylog.info(\"now building Dockerfile for \" + this.cleanTag);\r\n        let done = plugins.q.defer();\r\n        this.patchContents();\r\n        bashBare(\"docker build -t \" + this.buildTag + \" -f \" + this.filePath + \" .\");\r\n        NpmciEnv.dockerFilesBuilt.push(this);\r\n        this.restoreContents();\r\n        done.resolve();\r\n        return done.promise;\r\n    };\r\n    push(){\r\n        let done = plugins.q.defer();\r\n        if(this.buildTag){\r\n            bashBare(\"docker push \" + this.buildTag);\r\n        } else {\r\n            plugins.beautylog.error(\"Dockerfile hasn't been built yet!\");\r\n        }\r\n        done.resolve();\r\n        return done.promise;\r\n    }\r\n    pull(){\r\n        bashBare(\"docker pull \" + this.buildTag);\r\n    };\r\n    test(){\r\n        let testFile:string = plugins.path.join(paths.NpmciTestDir,\"test_\" + this.version + \".sh\");\r\n        let testFileExists:boolean = plugins.smartfile.checks.fileExistsSync(testFile);\r\n        if(testFileExists){\r\n            bashBare(\"docker run --name npmci_test_container \" + this.buildTag + \" mkdir /npmci_test\");\r\n            bashBare(\"docker cp \" + testFile + \" npmci_test_container:/npmci_test/test.sh\");\r\n            bashBare(\"docker commit npmci_test_container npmci_test_image\");\r\n            bashBare(\"docker run npmci_test_image sh /npmci_test/test.sh\");\r\n            bashBare(\"docker rm npmci_test_container\");\r\n            bashBare(\"docker rmi --force npmci_test_image\");\r\n        } else {\r\n            plugins.beautylog.warn(\"skipping tests for \" + this.cleanTag + \" because no testfile was found!\");\r\n        }\r\n    };\r\n    release(){\r\n        bashBare(\"docker tag \" + this.buildTag + \" \" + this.releaseTag);\r\n        bashBare(\"docker push \" + this.releaseTag);\r\n    }\r\n    getId(){\r\n        let containerId = bashBare(\"docker inspect --type=image --format=\\\"{{.Id}}\\\" \" + this.buildTag);\r\n        return containerId;\r\n    };\r\n    patchContents(){\r\n        let done = plugins.q.defer();\r\n        if(this.localBaseImageDependent == true){\r\n            plugins.beautylog.info(\"patching Dockerfile due to local build dependency!\");\r\n            this.patchedContent = this.content.replace(/FROM\\s[a-zA-Z0-9\\/\\-\\:]*/, 'FROM ' + this.localBaseDockerfile.buildTag);\r\n            plugins.smartfile.memory.toFsSync(\r\n                this.patchedContent,\r\n                {\r\n                    fileName:plugins.path.parse(this.filePath).name,\r\n                    filePath:plugins.path.parse(this.filePath).dir\r\n                }\r\n            );\r\n        }\r\n        done.resolve();\r\n        return done.promise;\r\n    };\r\n    restoreContents(){\r\n        let done = plugins.q.defer();\r\n        if(this.localBaseImageDependent == true){\r\n            plugins.smartfile.memory.toFsSync(\r\n                this.content,\r\n                {\r\n                    fileName:plugins.path.parse(this.filePath).name,\r\n                    filePath:plugins.path.parse(this.filePath).dir\r\n                }\r\n            );\r\n        }\r\n        done.resolve();\r\n        return done.promise;\r\n    };\r\n}\r\n\r\nexport let dockerFileVersion = function(dockerfileNameArg:string):string{\r\n    let versionString:string;\r\n    let versionRegex = /Dockerfile_([a-zA-Z0-9\\.]*)$/;\r\n    let regexResultArray = versionRegex.exec(dockerfileNameArg);\r\n    if(regexResultArray && regexResultArray.length == 2){\r\n        versionString = regexResultArray[1];        \r\n    } else {\r\n        versionString = \"latest\";\r\n    }\r\n    return versionString;\r\n}\r\n\r\nexport let dockerBaseImage = function(dockerfileContentArg:string){\r\n    let baseImageRegex = /FROM\\s([a-zA-z0-9\\/\\-\\:]*)\\n?/\r\n    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)\r\n    return regexResultArray[1];\r\n}\r\n\r\nexport let dockerTag = function(repoArg:string,versionArg:string,stageArg:string):string{\r\n    let tagString:string;\r\n    let registry = NpmciEnv.dockerRegistry;\r\n    if(stageArg == \"build\"  || stageArg == \"test\"){\r\n        registry = \"registry.gitlab.com\";\r\n    } \r\n    let repo = repoArg;\r\n    let version = versionArg;\r\n    if(stageArg == \"build\"  || stageArg == \"test\"){\r\n        version = version + \"_test\";\r\n    }\r\n    tagString = registry + \"/\" + repo + \":\" + version;\r\n    return tagString;\r\n};\r\n\r\nexport let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[],trackingArrayArg:Dockerfile[]):string[]{\r\n    let cleanTagsArray:string[] = [];\r\n    dockerfileArrayArg.forEach(function(dockerfileArg){\r\n        if(trackingArrayArg.indexOf(dockerfileArg) == -1){\r\n            cleanTagsArray.push(dockerfileArg.cleanTag);\r\n        }\r\n    });\r\n    return cleanTagsArray;\r\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\";\r\nimport * as paths from \"./npmci.paths\";\r\nimport * as NpmciEnv from \"./npmci.env\";\r\nimport {bashBare} from \"./npmci.bash\";\r\n\r\nexport let build = function(){\r\n    let done = plugins.q.defer();\r\n    readDockerfiles()\r\n        .then(sortDockerfiles)\r\n        .then(mapDockerfiles)\r\n        .then(buildDockerfiles)\r\n        .then(pushDockerfiles)\r\n        .then(() => {\r\n            done.resolve();\r\n        });\r\n    return done.promise;\r\n}\r\n\r\nexport let readDockerfiles = function(){\r\n    let done = plugins.q.defer();\r\n    let readDockerfilesArray:Dockerfile[] = []\r\n    plugins.gulp.src(\"./Dockerfile*\")\r\n        .pipe(plugins.through2.obj(function(file,enc,cb){\r\n            let myDockerfile = new Dockerfile({\r\n                filePath:file.path,\r\n                read:true\r\n            });\r\n            readDockerfilesArray.push(myDockerfile);\r\n            cb(null,file);\r\n         },function(){\r\n             done.resolve(readDockerfilesArray);\r\n         }));\r\n    return done.promise;\r\n}\r\n\r\nexport let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){\r\n    let done = plugins.q.defer();\r\n    let sortedArray:Dockerfile[] = [];\r\n    let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray);\r\n    let sorterFunctionCounter:number = 0;\r\n    let sorterFunction = function(){\r\n        sortableArrayArg.forEach((dockerfileArg)=>{\r\n            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray);\r\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && sortedArray.indexOf(dockerfileArg) == -1){\r\n                sortedArray.push(dockerfileArg);\r\n            };\r\n            if(cleanTagsOriginal.indexOf(dockerfileArg.baseImage) != -1){\r\n                dockerfileArg.localBaseImageDependent = true;\r\n            };\r\n        });\r\n        if(sortableArrayArg.length == sortedArray.length){\r\n            done.resolve(sortedArray);\r\n        } else if (sorterFunctionCounter < 10) {\r\n            sorterFunctionCounter++;\r\n            sorterFunction();\r\n        };\r\n    }\r\n    sorterFunction();\r\n    return done.promise;\r\n};\r\n\r\nexport let mapDockerfiles = function(sortedArray:Dockerfile[]){\r\n    let done = plugins.q.defer();\r\n    sortedArray.forEach((dockerfileArg) => {\r\n        if(dockerfileArg.localBaseImageDependent){\r\n            sortedArray.forEach((dockfile2:Dockerfile) => {\r\n                if(dockfile2.cleanTag == dockerfileArg.baseImage){\r\n                    dockerfileArg.localBaseDockerfile = dockfile2;\r\n                }\r\n            })\r\n        };\r\n    });\r\n    done.resolve(sortedArray);\r\n    return done.promise;\r\n}\r\n\r\nexport let buildDockerfiles = (sortedArrayArg:Dockerfile[]) => {\r\n    let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.build();\r\n    })\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport let pushDockerfiles = function(sortedArrayArg:Dockerfile[],regsitryArg = \"registry.gitlab.com\"){\r\n    let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.push(regsitryArg);\r\n    });\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport let pullDockerfileImages = (sortableArrayArg:Dockerfile[],registryArg = \"registry.gitlab.com\") => {\r\n    let done = plugins.q.defer();\r\n    sortableArrayArg.forEach((dockerfileArg) => {\r\n        dockerfileArg.pull(registryArg);\r\n    });\r\n    done.resolve(sortableArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport let testDockerfiles = (sortedArrayArg:Dockerfile[]) => {\r\n    let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.test();\r\n    });\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n};\r\n\r\nexport let releaseDockerfiles = (sortedArrayArg:Dockerfile[], registryArg = NpmciEnv.dockerRegistry) => {\r\n     let done = plugins.q.defer();\r\n    sortedArrayArg.forEach(function(dockerfileArg){\r\n        dockerfileArg.push(registryArg);\r\n    });\r\n    done.resolve(sortedArrayArg);\r\n    return done.promise;\r\n}\r\n\r\nexport class Dockerfile {\r\n    filePath:string;\r\n    repo:string;\r\n    version:string;\r\n    cleanTag:string;\r\n    buildTag:string;\r\n    testTag:string;\r\n    releaseTag:string;\r\n    containerName:string\r\n    content:string;\r\n    baseImage:string;\r\n    localBaseImageDependent:boolean;\r\n    localBaseDockerfile:Dockerfile;\r\n    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){\r\n        this.filePath = options.filePath;\r\n        this.repo = NpmciEnv.repo.user + \"/\" + NpmciEnv.repo.repo;\r\n        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);\r\n        this.cleanTag = this.repo + \":\" + this.version;\r\n        this.buildTag = this.cleanTag;\r\n        this.testTag = dockerTag(\"registry.gitlab.com\",this.repo,this.version,\"test\");\r\n        this.releaseTag = dockerTag(NpmciEnv.dockerRegistry,this.repo,this.version);\r\n        this.containerName = \"dockerfile-\" + this.version;\r\n        if(options.filePath && options.read){\r\n            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));\r\n        };\r\n        this.baseImage = dockerBaseImage(this.content);\r\n        this.localBaseImageDependent = false;\r\n    };\r\n    build(){\r\n        let done = plugins.q.defer();\r\n        plugins.beautylog.info(\"now building Dockerfile for \" + this.cleanTag);\r\n        bashBare(\"docker build -t \" + this.buildTag + \" -f \" + this.filePath + \" .\");\r\n        NpmciEnv.dockerFilesBuilt.push(this);\r\n        done.resolve();\r\n        return done.promise;\r\n    };\r\n    push(registryArg:string){\r\n        let done = plugins.q.defer();\r\n        let pushTag;\r\n        NpmciEnv.buildStage == \"test\" ? pushTag = this.testTag : pushTag = this.releaseTag;\r\n        bashBare(\"docker tag \" + this.buildTag + \" \" + pushTag);\r\n        bashBare(\"docker push \" + pushTag);\r\n        done.resolve();\r\n        return done.promise;\r\n    }\r\n    pull(registryArg:string){\r\n        let pullTag = this.testTag;\r\n        bashBare(\"docker pull \" + pullTag);\r\n        bashBare(\"docker tag \" + pullTag + \" \" + this.buildTag);\r\n    };\r\n    test(){\r\n        let testFile:string = plugins.path.join(paths.NpmciTestDir,\"test_\" + this.version + \".sh\");\r\n        let testFileExists:boolean = plugins.smartfile.checks.fileExistsSync(testFile);\r\n        if(testFileExists){\r\n            bashBare(\"docker run --name npmci_test_container \" + this.buildTag + \" mkdir /npmci_test\");\r\n            bashBare(\"docker cp \" + testFile + \" npmci_test_container:/npmci_test/test.sh\");\r\n            bashBare(\"docker commit npmci_test_container npmci_test_image\");\r\n            bashBare(\"docker run npmci_test_image sh /npmci_test/test.sh\");\r\n            bashBare(\"docker rm npmci_test_container\");\r\n            bashBare(\"docker rmi --force npmci_test_image\");\r\n        } else {\r\n            plugins.beautylog.warn(\"skipping tests for \" + this.cleanTag + \" because no testfile was found!\");\r\n        }\r\n    };\r\n    getId(){\r\n        let containerId = bashBare(\"docker inspect --type=image --format=\\\"{{.Id}}\\\" \" + this.buildTag);\r\n        return containerId;\r\n    };\r\n}\r\n\r\nexport let dockerFileVersion = function(dockerfileNameArg:string):string{\r\n    let versionString:string;\r\n    let versionRegex = /Dockerfile_([a-zA-Z0-9\\.]*)$/;\r\n    let regexResultArray = versionRegex.exec(dockerfileNameArg);\r\n    if(regexResultArray && regexResultArray.length == 2){\r\n        versionString = regexResultArray[1];        \r\n    } else {\r\n        versionString = \"latest\";\r\n    }\r\n    return versionString;\r\n}\r\n\r\nexport let dockerBaseImage = function(dockerfileContentArg:string){\r\n    let baseImageRegex = /FROM\\s([a-zA-z0-9\\/\\-\\:]*)\\n?/\r\n    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)\r\n    return regexResultArray[1];\r\n}\r\n\r\nexport let dockerTag = function(registryArg:string,repoArg:string,versionArg:string,suffixArg?:string):string{\r\n    let tagString:string;\r\n    let registry = registryArg;\r\n    let repo = repoArg;\r\n    let version = versionArg;\r\n    if(suffixArg){\r\n        version = versionArg + \"_\" + suffixArg;\r\n    };\r\n    tagString = registry + \"/\" + repo + \":\" + version;\r\n    return tagString;\r\n};\r\n\r\nexport let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[],trackingArrayArg:Dockerfile[]):string[]{\r\n    let cleanTagsArray:string[] = [];\r\n    dockerfileArrayArg.forEach(function(dockerfileArg){\r\n        if(trackingArrayArg.indexOf(dockerfileArg) == -1){\r\n            cleanTagsArray.push(dockerfileArg.cleanTag);\r\n        }\r\n    });\r\n    return cleanTagsArray;\r\n}"]} diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index a11e93d..2ee2773 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -83,19 +83,19 @@ export let buildDockerfiles = (sortedArrayArg:Dockerfile[]) => { return done.promise; } -export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){ +export let pushDockerfiles = function(sortedArrayArg:Dockerfile[],regsitryArg = "registry.gitlab.com"){ let done = plugins.q.defer(); sortedArrayArg.forEach(function(dockerfileArg){ - dockerfileArg.push(); + dockerfileArg.push(regsitryArg); }); done.resolve(sortedArrayArg); return done.promise; } -export let pullDockerfileImages = (sortableArrayArg:Dockerfile[]) => { +export let pullDockerfileImages = (sortableArrayArg:Dockerfile[],registryArg = "registry.gitlab.com") => { let done = plugins.q.defer(); sortableArrayArg.forEach((dockerfileArg) => { - dockerfileArg.pull(); + dockerfileArg.pull(registryArg); }); done.resolve(sortableArrayArg); return done.promise; @@ -110,10 +110,10 @@ export let testDockerfiles = (sortedArrayArg:Dockerfile[]) => { return done.promise; }; -export let releaseDockerfiles = (sortedArrayArg:Dockerfile[]) => { +export let releaseDockerfiles = (sortedArrayArg:Dockerfile[], registryArg = NpmciEnv.dockerRegistry) => { let done = plugins.q.defer(); sortedArrayArg.forEach(function(dockerfileArg){ - dockerfileArg.release(); + dockerfileArg.push(registryArg); }); done.resolve(sortedArrayArg); return done.promise; @@ -125,10 +125,10 @@ export class Dockerfile { version:string; cleanTag:string; buildTag:string; + testTag:string; releaseTag:string; containerName:string content:string; - patchedContent:string; baseImage:string; localBaseImageDependent:boolean; localBaseDockerfile:Dockerfile; @@ -137,8 +137,9 @@ export class Dockerfile { this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo; this.version = dockerFileVersion(plugins.path.parse(options.filePath).base); this.cleanTag = this.repo + ":" + this.version; - this.buildTag = dockerTag(this.repo,this.version,"build"); - this.releaseTag = dockerTag(this.repo,this.version,"release"); + this.buildTag = this.cleanTag; + this.testTag = dockerTag("registry.gitlab.com",this.repo,this.version,"test"); + this.releaseTag = dockerTag(NpmciEnv.dockerRegistry,this.repo,this.version); this.containerName = "dockerfile-" + this.version; if(options.filePath && options.read){ this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath)); @@ -147,27 +148,26 @@ export class Dockerfile { this.localBaseImageDependent = false; }; build(){ - plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); let done = plugins.q.defer(); - this.patchContents(); + plugins.beautylog.info("now building Dockerfile for " + this.cleanTag); bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " ."); NpmciEnv.dockerFilesBuilt.push(this); - this.restoreContents(); done.resolve(); return done.promise; }; - push(){ + push(registryArg:string){ let done = plugins.q.defer(); - if(this.buildTag){ - bashBare("docker push " + this.buildTag); - } else { - plugins.beautylog.error("Dockerfile hasn't been built yet!"); - } + let pushTag; + NpmciEnv.buildStage == "test" ? pushTag = this.testTag : pushTag = this.releaseTag; + bashBare("docker tag " + this.buildTag + " " + pushTag); + bashBare("docker push " + pushTag); done.resolve(); return done.promise; } - pull(){ - bashBare("docker pull " + this.buildTag); + pull(registryArg:string){ + let pullTag = this.testTag; + bashBare("docker pull " + pullTag); + bashBare("docker tag " + pullTag + " " + this.buildTag); }; test(){ let testFile:string = plugins.path.join(paths.NpmciTestDir,"test_" + this.version + ".sh"); @@ -183,44 +183,10 @@ export class Dockerfile { plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!"); } }; - release(){ - bashBare("docker tag " + this.buildTag + " " + this.releaseTag); - bashBare("docker push " + this.releaseTag); - } getId(){ let containerId = bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag); return containerId; }; - patchContents(){ - let done = plugins.q.defer(); - if(this.localBaseImageDependent == true){ - plugins.beautylog.info("patching Dockerfile due to local build dependency!"); - this.patchedContent = this.content.replace(/FROM\s[a-zA-Z0-9\/\-\:]*/, 'FROM ' + this.localBaseDockerfile.buildTag); - plugins.smartfile.memory.toFsSync( - this.patchedContent, - { - fileName:plugins.path.parse(this.filePath).name, - filePath:plugins.path.parse(this.filePath).dir - } - ); - } - done.resolve(); - return done.promise; - }; - restoreContents(){ - let done = plugins.q.defer(); - if(this.localBaseImageDependent == true){ - plugins.smartfile.memory.toFsSync( - this.content, - { - fileName:plugins.path.parse(this.filePath).name, - filePath:plugins.path.parse(this.filePath).dir - } - ); - } - done.resolve(); - return done.promise; - }; } export let dockerFileVersion = function(dockerfileNameArg:string):string{ @@ -241,17 +207,14 @@ export let dockerBaseImage = function(dockerfileContentArg:string){ return regexResultArray[1]; } -export let dockerTag = function(repoArg:string,versionArg:string,stageArg:string):string{ +export let dockerTag = function(registryArg:string,repoArg:string,versionArg:string,suffixArg?:string):string{ let tagString:string; - let registry = NpmciEnv.dockerRegistry; - if(stageArg == "build" || stageArg == "test"){ - registry = "registry.gitlab.com"; - } + let registry = registryArg; let repo = repoArg; let version = versionArg; - if(stageArg == "build" || stageArg == "test"){ - version = version + "_test"; - } + if(suffixArg){ + version = versionArg + "_" + suffixArg; + }; tagString = registry + "/" + repo + ":" + version; return tagString; };