From 36c4a676c71fd8f2541b43c3cc603b9098434541 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 5 Jun 2016 22:51:59 +0200 Subject: [PATCH] now patching Dockerfiles to use local images during build --- dist/npmci.bash.js | 6 ++-- dist/npmci.build.docker.d.ts | 9 +++--- dist/npmci.build.docker.js | 51 +++++++++++++++++++++++---------- dist/npmci.env.d.ts | 3 +- dist/npmci.env.js | 3 +- dist/npmci.get.d.ts | 0 dist/npmci.get.js | 3 -- dist/npmci.publish.js | 16 ++--------- ts/npmci.build.docker.ts | 55 +++++++++++++++++++++++++++--------- ts/npmci.get.ts | 0 ts/npmci.publish.ts | 18 ++++-------- 11 files changed, 96 insertions(+), 68 deletions(-) delete mode 100644 dist/npmci.get.d.ts delete mode 100644 dist/npmci.get.js delete mode 100644 ts/npmci.get.ts diff --git a/dist/npmci.bash.js b/dist/npmci.bash.js index 9fa4887..a150c14 100644 --- a/dist/npmci.bash.js +++ b/dist/npmci.bash.js @@ -12,7 +12,7 @@ exports.bash = function (commandArg, retryArg) { process.exit(1); } else if (exitCode == 0) { - i = retryArg + 1; + i = retryArg + 1; // if everything works out ok retrials are not wanted } else { plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString); @@ -33,7 +33,7 @@ exports.bashBare = function (commandArg, retryArg) { process.exit(1); } else if (exitCode == 0) { - i = retryArg + 1; + i = retryArg + 1; // if everything works out ok retrials are not wanted } else { plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString); @@ -46,4 +46,4 @@ exports.bashBare = function (commandArg, retryArg) { } }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQ2hDLFlBQUksR0FBRyxVQUFDLFVBQWlCLEVBQUMsUUFBWTtJQUFaLHdCQUFZLEdBQVosWUFBWTtJQUM3QyxFQUFFLENBQUEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUN4QixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBQyxDQUFDO1lBQ2hDLElBQUksUUFBUSxHQUFVLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUN0QywyQ0FBMkM7Z0JBQzNDLFVBQVU7Z0JBQ1YsSUFBSSxDQUNQLENBQUMsSUFBSSxDQUFDO1lBQ1AsRUFBRSxDQUFBLENBQUMsUUFBUSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksUUFBUSxDQUFDLENBQUEsQ0FBQztnQkFDaEMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNwQixDQUFDO1lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQSxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUMsQ0FBQSxDQUFDO2dCQUNyQixDQUFDLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQztZQUNyQixDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLEdBQUcsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO2dCQUNoRixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsUUFBUSxHQUFHLE1BQU0sR0FBSSxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDdEYsQ0FBQztRQUNMLENBQUM7SUFDTCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDbkUsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUVVLGdCQUFRLEdBQUcsVUFBQyxVQUFVLEVBQUMsUUFBWTtJQUFaLHdCQUFZLEdBQVosWUFBWTtJQUMxQyxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUN6QixHQUFHLENBQUEsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLFFBQVEsRUFBRSxDQUFDLEVBQUUsRUFBQyxDQUFDO1lBQy9CLElBQUksUUFBUSxHQUFVLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLElBQUksQ0FBQztZQUM1RCxFQUFFLENBQUEsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBQSxDQUFDO2dCQUNoQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFBLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFBLENBQUM7Z0JBQ3JCLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDO1lBQ3JCLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQ2hGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEdBQUcsTUFBTSxHQUFJLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUN0RixDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNuRSxDQUFDO0FBQ0wsQ0FBQyxDQUFBIiwiZmlsZSI6Im5wbWNpLmJhc2guanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuZXhwb3J0IGxldCBiYXNoID0gKGNvbW1hbmRBcmc6c3RyaW5nLHJldHJ5QXJnID0gMikgPT4ge1xyXG4gICAgaWYoIXByb2Nlc3MuZW52Lk5QTVRTX1RFU1Qpe1xyXG4gICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDw9IHJldHJ5QXJnOyBpKyspe1xyXG4gICAgICAgICAgICBsZXQgZXhpdENvZGU6bnVtYmVyID0gcGx1Z2lucy5zaGVsbGpzLmV4ZWMoXHJcbiAgICAgICAgICAgICAgICBcImJhc2ggLWMgXFxcInNvdXJjZSAvdXNyL2xvY2FsL252bS9udm0uc2ggJiZcIiArXHJcbiAgICAgICAgICAgICAgICBjb21tYW5kQXJnICtcclxuICAgICAgICAgICAgICAgIFwiXFxcIlwiXHJcbiAgICAgICAgICAgICkuY29kZTtcclxuICAgICAgICAgICAgaWYoZXhpdENvZGUgIT09IDAgJiYgaSA9PSByZXRyeUFyZyl7XHJcbiAgICAgICAgICAgICAgICBwcm9jZXNzLmV4aXQoMSk7XHJcbiAgICAgICAgICAgIH0gZWxzZSBpZihleGl0Q29kZSA9PSAwKXtcclxuICAgICAgICAgICAgICAgIGkgPSByZXRyeUFyZyArIDE7XHJcbiAgICAgICAgICAgIH0gZWxzZSB7XHJcbiAgICAgICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy53YXJuKFwiU29tZXRoaW5nIHdlbnQgd3JvbmchIEV4aXQgQ29kZTogXCIgKyBleGl0Q29kZS50b1N0cmluZyk7XHJcbiAgICAgICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwiUmV0cnkgXCIgKyAoaSArIDEpLnRvU3RyaW5nICsgXCIgb2YgXCIgKyAgcmV0cnlBcmcudG9TdHJpbmcpO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfVxyXG4gICAgfSBlbHNlIHtcclxuICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5sb2coXCJTaGVsbEV4ZWMgd291bGQgYmU6IFwiICsgY29tbWFuZEFyZy5ibHVlKVxyXG4gICAgfVxyXG59XHJcblxyXG5leHBvcnQgbGV0IGJhc2hCYXJlID0gKGNvbW1hbmRBcmcscmV0cnlBcmcgPSAyKSA9PiB7XHJcbiAgICBpZiAoIXByb2Nlc3MuZW52Lk5QTVRTX1RFU1Qpe1xyXG4gICAgICAgIGZvcihsZXQgaSA9IDA7IGkgPD0gcmV0cnlBcmc7IGkrKyl7XHJcbiAgICAgICAgICAgIGxldCBleGl0Q29kZTpudW1iZXIgPSBwbHVnaW5zLnNoZWxsanMuZXhlYyhjb21tYW5kQXJnKS5jb2RlO1xyXG4gICAgICAgICAgICBpZihleGl0Q29kZSAhPT0gMCAmJiBpID09IHJldHJ5QXJnKXtcclxuICAgICAgICAgICAgICAgIHByb2Nlc3MuZXhpdCgxKTtcclxuICAgICAgICAgICAgfSBlbHNlIGlmKGV4aXRDb2RlID09IDApe1xyXG4gICAgICAgICAgICAgICAgaSA9IHJldHJ5QXJnICsgMTtcclxuICAgICAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLndhcm4oXCJTb21ldGhpbmcgd2VudCB3cm9uZyEgRXhpdCBDb2RlOiBcIiArIGV4aXRDb2RlLnRvU3RyaW5nKTtcclxuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJSZXRyeSBcIiArIChpICsgMSkudG9TdHJpbmcgKyBcIiBvZiBcIiArICByZXRyeUFyZy50b1N0cmluZyk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcIlNoZWxsRXhlYyB3b3VsZCBiZTogXCIgKyBjb21tYW5kQXJnLmJsdWUpXHJcbiAgICB9XHJcbn0iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,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QUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNuRSxDQUFDO0FBQ0wsQ0FBQyxDQUFBIiwiZmlsZSI6Im5wbWNpLmJhc2guanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuZXhwb3J0IGxldCBiYXNoID0gKGNvbW1hbmRBcmc6c3RyaW5nLHJldHJ5QXJnID0gMikgPT4ge1xyXG4gICAgaWYoIXByb2Nlc3MuZW52Lk5QTVRTX1RFU1Qpe1xyXG4gICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDw9IHJldHJ5QXJnOyBpKyspe1xyXG4gICAgICAgICAgICBsZXQgZXhpdENvZGU6bnVtYmVyID0gcGx1Z2lucy5zaGVsbGpzLmV4ZWMoXHJcbiAgICAgICAgICAgICAgICBcImJhc2ggLWMgXFxcInNvdXJjZSAvdXNyL2xvY2FsL252bS9udm0uc2ggJiZcIiArXHJcbiAgICAgICAgICAgICAgICBjb21tYW5kQXJnICtcclxuICAgICAgICAgICAgICAgIFwiXFxcIlwiXHJcbiAgICAgICAgICAgICkuY29kZTtcclxuICAgICAgICAgICAgaWYoZXhpdENvZGUgIT09IDAgJiYgaSA9PSByZXRyeUFyZyl7XHJcbiAgICAgICAgICAgICAgICBwcm9jZXNzLmV4aXQoMSk7XHJcbiAgICAgICAgICAgIH0gZWxzZSBpZihleGl0Q29kZSA9PSAwKXtcclxuICAgICAgICAgICAgICAgIGkgPSByZXRyeUFyZyArIDE7IC8vIGlmIGV2ZXJ5dGhpbmcgd29ya3Mgb3V0IG9rIHJldHJpYWxzIGFyZSBub3Qgd2FudGVkXHJcbiAgICAgICAgICAgIH0gZWxzZSB7XHJcbiAgICAgICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy53YXJuKFwiU29tZXRoaW5nIHdlbnQgd3JvbmchIEV4aXQgQ29kZTogXCIgKyBleGl0Q29kZS50b1N0cmluZyk7XHJcbiAgICAgICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwiUmV0cnkgXCIgKyAoaSArIDEpLnRvU3RyaW5nICsgXCIgb2YgXCIgKyAgcmV0cnlBcmcudG9TdHJpbmcpO1xyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgfVxyXG4gICAgfSBlbHNlIHtcclxuICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5sb2coXCJTaGVsbEV4ZWMgd291bGQgYmU6IFwiICsgY29tbWFuZEFyZy5ibHVlKVxyXG4gICAgfVxyXG59XHJcblxyXG5leHBvcnQgbGV0IGJhc2hCYXJlID0gKGNvbW1hbmRBcmcscmV0cnlBcmcgPSAyKSA9PiB7XHJcbiAgICBpZiAoIXByb2Nlc3MuZW52Lk5QTVRTX1RFU1Qpe1xyXG4gICAgICAgIGZvcihsZXQgaSA9IDA7IGkgPD0gcmV0cnlBcmc7IGkrKyl7XHJcbiAgICAgICAgICAgIGxldCBleGl0Q29kZTpudW1iZXIgPSBwbHVnaW5zLnNoZWxsanMuZXhlYyhjb21tYW5kQXJnKS5jb2RlO1xyXG4gICAgICAgICAgICBpZihleGl0Q29kZSAhPT0gMCAmJiBpID09IHJldHJ5QXJnKXtcclxuICAgICAgICAgICAgICAgIHByb2Nlc3MuZXhpdCgxKTtcclxuICAgICAgICAgICAgfSBlbHNlIGlmKGV4aXRDb2RlID09IDApe1xyXG4gICAgICAgICAgICAgICAgaSA9IHJldHJ5QXJnICsgMTsgLy8gaWYgZXZlcnl0aGluZyB3b3JrcyBvdXQgb2sgcmV0cmlhbHMgYXJlIG5vdCB3YW50ZWRcclxuICAgICAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLndhcm4oXCJTb21ldGhpbmcgd2VudCB3cm9uZyEgRXhpdCBDb2RlOiBcIiArIGV4aXRDb2RlLnRvU3RyaW5nKTtcclxuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJSZXRyeSBcIiArIChpICsgMSkudG9TdHJpbmcgKyBcIiBvZiBcIiArICByZXRyeUFyZy50b1N0cmluZyk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9XHJcbiAgICB9IGVsc2Uge1xyXG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcIlNoZWxsRXhlYyB3b3VsZCBiZTogXCIgKyBjb21tYW5kQXJnLmJsdWUpXHJcbiAgICB9XHJcbn0iXX0= diff --git a/dist/npmci.build.docker.d.ts b/dist/npmci.build.docker.d.ts index 63f71c0..5e12f1c 100644 --- a/dist/npmci.build.docker.d.ts +++ b/dist/npmci.build.docker.d.ts @@ -1,5 +1,6 @@ export declare let build: () => any; export declare let readDockerfiles: () => any; +export declare let getDockerImagesGitlab: (sortableArrayArg: Dockerfile[]) => void; export declare let sortDockerfiles: (sortableArrayArg: Dockerfile[]) => any; export declare let mapDockerfiles: (sortedArray: Dockerfile[]) => any; export declare let buildDockerfiles: (sortedArrayArg: Dockerfile[]) => any; @@ -20,10 +21,10 @@ export declare class Dockerfile { fileContents?: string | Buffer; read?: boolean; }); - build(): void; - push(): void; - patchContents(): void; - restoreContents(): void; + build(): any; + push(): any; + patchContents(): any; + restoreContents(): any; } export declare let dockerFileVersion: (dockerfileNameArg: string) => string; export declare let dockerBaseImage: (dockerfileContentArg: string) => string; diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index 2d9d6b0..476c4fc 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -30,6 +30,8 @@ exports.readDockerfiles = function () { })); return done.promise; }; +exports.getDockerImagesGitlab = function (sortableArrayArg) { +}; exports.sortDockerfiles = function (sortableArrayArg) { var done = plugins.q.defer(); var sortedArray = []; @@ -63,7 +65,6 @@ exports.mapDockerfiles = function (sortedArray) { var done = plugins.q.defer(); sortedArray.forEach(function (dockerfileArg) { if (dockerfileArg.localBaseImageDependent) { - var dockerfileDependency = void 0; sortedArray.forEach(function (dockfile2) { if (dockfile2.cleanTag == dockerfileArg.baseImage) { dockerfileArg.localBaseDockerfile = dockfile2; @@ -106,31 +107,51 @@ var Dockerfile = (function () { } ; Dockerfile.prototype.build = function () { - if (!this.buildTag) { - this.patchContents(); - var tag = exports.dockerTag(this.repo, this.version); - npmci_bash_1.bashBare("docker build -t " + tag + " -f " + this.filePath + " ."); - this.buildTag = tag; - NpmciEnv.dockerFilesBuilt.push(this); - this.restoreContents(); - } - else { - plugins.beautylog.error("This Dockerfile has already been built!"); - } + var done = plugins.q.defer(); + this.patchContents(); + var tag = exports.dockerTag(this.repo, this.version); + npmci_bash_1.bashBare("docker build -t " + tag + " -f " + this.filePath + " ."); + this.buildTag = tag; + NpmciEnv.dockerFilesBuilt.push(this); + this.restoreContents(); + done.resolve(); + return done.promise; }; ; Dockerfile.prototype.push = function () { + 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!"); } + done.resolve(); + return done.promise; }; Dockerfile.prototype.patchContents = function () { + var done = plugins.q.defer(); + if (this.localBaseImageDependent == true) { + 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; @@ -156,12 +177,12 @@ exports.dockerBaseImage = function (dockerfileContentArg) { exports.dockerTag = function (repoArg, versionArg) { var tagString; var registry = NpmciEnv.dockerRegistry; - if (process.env.CI_BUILD_STAGE == "build" || process.env.CI_BUILD_STAGE == "test") { + if (NpmciEnv.buildStage == "build" || NpmciEnv.buildStage == "test") { registry = "registry.gitlab.com"; } var repo = repoArg; var version = versionArg; - if (process.env.CI_BUILD_STAGE == "build" || process.env.CI_BUILD_STAGE == "test") { + if (NpmciEnv.buildStage == "build" || NpmciEnv.buildStage == "test") { version = version + "_test"; } tagString = registry + "/" + repo + ":" + version; @@ -177,4 +198,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 NpmciEnv from \"./npmci.env\";\r\nimport {bashBare} from \"./npmci.bash\";\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 trackingArray:Dockerfile[] = [];\r\n    let sorterFunctionCounter:number = 0;\r\n    let sorterFunction = function(){\r\n        sortableArrayArg.forEach((dockerfileArg)=>{\r\n            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,trackingArray);\r\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && trackingArray.indexOf(dockerfileArg) == -1){\r\n                sortedArray.push(dockerfileArg);\r\n                trackingArray.push(dockerfileArg);\r\n            } else if(cleanTags.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            let dockerfileDependency:Dockerfile;\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 = function(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 class Dockerfile {\r\n    filePath:string;\r\n    repo:string;\r\n    version:string;\r\n    cleanTag:string;\r\n    buildTag: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        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        if(!this.buildTag){\r\n            this.patchContents();\r\n            let tag = dockerTag(this.repo,this.version);\r\n            bashBare(\"docker build -t \" + tag + \" -f \" + this.filePath + \" .\");\r\n            this.buildTag = tag;\r\n            NpmciEnv.dockerFilesBuilt.push(this);\r\n            this.restoreContents();\r\n        } else {\r\n            plugins.beautylog.error(\"This Dockerfile has already been built!\");\r\n        }\r\n        \r\n    };\r\n    push(){\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    }\r\n    patchContents(){\r\n        \r\n    };\r\n    restoreContents(){\r\n        \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):string{\r\n    let tagString:string;\r\n    let registry = NpmciEnv.dockerRegistry;\r\n    if(process.env.CI_BUILD_STAGE == \"build\"  || process.env.CI_BUILD_STAGE == \"test\"){\r\n        registry = \"registry.gitlab.com\";\r\n    } \r\n    let repo = repoArg;\r\n    let version = versionArg;\r\n    if(process.env.CI_BUILD_STAGE == \"build\" || process.env.CI_BUILD_STAGE == \"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 NpmciEnv from \"./npmci.env\";\r\nimport {bashBare} from \"./npmci.bash\";\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 getDockerImagesGitlab = function(sortableArrayArg:Dockerfile[]){\r\n    \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 trackingArray:Dockerfile[] = [];\r\n    let sorterFunctionCounter:number = 0;\r\n    let sorterFunction = function(){\r\n        sortableArrayArg.forEach((dockerfileArg)=>{\r\n            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,trackingArray);\r\n            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && trackingArray.indexOf(dockerfileArg) == -1){\r\n                sortedArray.push(dockerfileArg);\r\n                trackingArray.push(dockerfileArg);\r\n            } else if(cleanTags.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 = function(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 class Dockerfile {\r\n    filePath:string;\r\n    repo:string;\r\n    version:string;\r\n    cleanTag:string;\r\n    buildTag: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        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        this.patchContents();\r\n        let tag = dockerTag(this.repo,this.version);\r\n        bashBare(\"docker build -t \" + tag + \" -f \" + this.filePath + \" .\");\r\n        this.buildTag = tag;\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    patchContents(){\r\n        let done = plugins.q.defer();\r\n        if(this.localBaseImageDependent == true){\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):string{\r\n    let tagString:string;\r\n    let registry = NpmciEnv.dockerRegistry;\r\n    if(NpmciEnv.buildStage == \"build\"  || NpmciEnv.buildStage == \"test\"){\r\n        registry = \"registry.gitlab.com\";\r\n    } \r\n    let repo = repoArg;\r\n    let version = versionArg;\r\n    if(NpmciEnv.buildStage == \"build\" || NpmciEnv.buildStage == \"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}"]} diff --git a/dist/npmci.env.d.ts b/dist/npmci.env.d.ts index c4dce94..ac48b1b 100644 --- a/dist/npmci.env.d.ts +++ b/dist/npmci.env.d.ts @@ -2,8 +2,7 @@ import "typings-global"; import { GitRepo } from "smartstring"; import { Dockerfile } from "./npmci.build.docker"; export declare let repo: GitRepo; -export declare let dockerTestTag: string; -export declare let dockerReleaseTag: string; +export declare let buildStage: string; export declare let dockerRegistry: any; export declare let dockerFilesBuilt: Dockerfile[]; export declare let dockerFiles: Dockerfile[]; diff --git a/dist/npmci.env.js b/dist/npmci.env.js index dd0d85d..29146d4 100644 --- a/dist/npmci.env.js +++ b/dist/npmci.env.js @@ -2,7 +2,8 @@ require("typings-global"); var smartstring_1 = require("smartstring"); exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO); +exports.buildStage = process.env.CI_BUILD_STAGE; exports.dockerFilesBuilt = []; exports.dockerFiles = []; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFLOUMsd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7R2l0UmVwb30gZnJvbSBcInNtYXJ0c3RyaW5nXCI7XHJcbmltcG9ydCB7RG9ja2VyZmlsZX0gZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcclxuXHJcbmV4cG9ydCBsZXQgcmVwbyA9IG5ldyBHaXRSZXBvKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xyXG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xyXG5leHBvcnQgbGV0IGRvY2tlclJlbGVhc2VUYWc6c3RyaW5nO1xyXG5cclxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzQnVpbHQ6RG9ja2VyZmlsZVtdID0gW107XHJcbmV4cG9ydCBsZXQgZG9ja2VyRmlsZXM6RG9ja2VyZmlsZVtdID0gW107XHJcblxyXG4iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQVcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFFdEQsa0JBQVUsR0FBVSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztBQUcvQyx3QkFBZ0IsR0FBZ0IsRUFBRSxDQUFDO0FBQ25DLG1CQUFXLEdBQWdCLEVBQUUsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcclxuaW1wb3J0IHtEb2NrZXJmaWxlfSBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCByZXBvOkdpdFJlcG8gPSBuZXcgR2l0UmVwbyhwcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPKTtcclxuXHJcbmV4cG9ydCBsZXQgYnVpbGRTdGFnZTpzdHJpbmcgPSBwcm9jZXNzLmVudi5DSV9CVUlMRF9TVEFHRTtcclxuXHJcbmV4cG9ydCBsZXQgZG9ja2VyUmVnaXN0cnk7IC8vIHdpbGwgYmUgc2V0IGJ5IG5wbWNpLnByZXBhcmVcclxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5cclxuIl19 diff --git a/dist/npmci.get.d.ts b/dist/npmci.get.d.ts deleted file mode 100644 index e69de29..0000000 diff --git a/dist/npmci.get.js b/dist/npmci.get.js deleted file mode 100644 index b445064..0000000 --- a/dist/npmci.get.js +++ /dev/null @@ -1,3 +0,0 @@ - - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJucG1jaS5nZXQuanMiLCJzb3VyY2VzQ29udGVudCI6W119 diff --git a/dist/npmci.publish.js b/dist/npmci.publish.js index 6b324e1..3292a2d 100644 --- a/dist/npmci.publish.js +++ b/dist/npmci.publish.js @@ -3,7 +3,7 @@ require("typings-global"); var plugins = require("./npmci.plugins"); var npmci_prepare_1 = require("./npmci.prepare"); var npmci_bash_1 = require("./npmci.bash"); -var NpmciEnv = require("./npmci.env"); +var NpmciBuildDocker = require("./npmci.build.docker"); exports.publish = function (serviceArg) { if (serviceArg === void 0) { serviceArg = "npm"; } switch (serviceArg) { @@ -25,19 +25,9 @@ var publishNpm = function () { }; var publishDocker = function () { var done = plugins.q.defer(); - NpmciEnv.dockerFilesBuilt.forEach(function (dockerfileArg) { - dockerfileArg.push(); - }); - done.resolve(); - return done.promise; -}; -var publishDockerTest = function () { - var done = plugins.q.defer(); - NpmciEnv.dockerFilesBuilt.forEach(function (dockerfileArg) { - dockerfileArg.push(); - }); + NpmciBuildDocker.readDockerfiles(); done.resolve(); return done.promise; }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyxJQUFZLFFBQVEsV0FBTSxhQUFhLENBQUMsQ0FBQTtBQUU3QixlQUFPLEdBQUcsVUFBQyxVQUF5QjtJQUF6QiwwQkFBeUIsR0FBekIsa0JBQXlCO0lBQzNDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDaEIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3hCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUMvQixDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYsSUFBSSxVQUFVLEdBQUk7SUFDZCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLHVCQUFPLENBQUMsS0FBSyxDQUFDO1NBQ1QsSUFBSSxDQUFDO1FBQ0YsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBRTtRQUMvQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLGFBQWEsR0FBRztJQUNoQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsVUFBUyxhQUFhO1FBQ3BELGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN6QixDQUFDLENBQUMsQ0FBQztJQUNILElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGLElBQUksaUJBQWlCLEdBQUc7SUFDcEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixRQUFRLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLFVBQVMsYUFBYTtRQUNwRCxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekIsQ0FBQyxDQUFDLENBQUM7SUFDSCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xyXG5pbXBvcnQge3ByZXBhcmV9IGZyb20gXCIuL25wbWNpLnByZXBhcmVcIjtcclxuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XHJcbmltcG9ydCAqIGFzIE5wbWNpRW52IGZyb20gXCIuL25wbWNpLmVudlwiO1xyXG5cclxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xyXG4gICAgc3dpdGNoIChzZXJ2aWNlQXJnKXtcclxuICAgICAgICBjYXNlIFwibnBtXCI6IFxyXG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaE5wbSgpO1xyXG4gICAgICAgIGNhc2UgXCJkb2NrZXJcIjpcclxuICAgICAgICAgICAgcmV0dXJuIHB1Ymxpc2hEb2NrZXIoKTtcclxuICAgIH1cclxufTtcclxuXHJcbmxldCBwdWJsaXNoTnBtICA9IGZ1bmN0aW9uKCl7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgcHJlcGFyZShcIm5wbVwiKVxyXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgIGJhc2goXCJucG0gcHVibGlzaFwiKTtcclxuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cub2soXCJEb25lIVwiKSA7XHJcbiAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgICAgIH0pO1xyXG4gICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59XHJcblxyXG5sZXQgcHVibGlzaERvY2tlciA9IGZ1bmN0aW9uKCl7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgTnBtY2lFbnYuZG9ja2VyRmlsZXNCdWlsdC5mb3JFYWNoKGZ1bmN0aW9uKGRvY2tlcmZpbGVBcmcpe1xyXG4gICAgICAgIGRvY2tlcmZpbGVBcmcucHVzaCgpO1xyXG4gICAgfSk7XHJcbiAgICBkb25lLnJlc29sdmUoKTtcclxuICAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn07XHJcblxyXG5sZXQgcHVibGlzaERvY2tlclRlc3QgPSBmdW5jdGlvbigpe1xyXG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcclxuICAgIE5wbWNpRW52LmRvY2tlckZpbGVzQnVpbHQuZm9yRWFjaChmdW5jdGlvbihkb2NrZXJmaWxlQXJnKXtcclxuICAgICAgICBkb2NrZXJmaWxlQXJnLnB1c2goKTtcclxuICAgIH0pO1xyXG4gICAgZG9uZS5yZXNvbHZlKCk7XHJcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59Il19 +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUVsQyxJQUFZLGdCQUFnQixXQUFNLHNCQUVsQyxDQUFDLENBRnVEO0FBRTdDLGVBQU8sR0FBRyxVQUFDLFVBQXlCO0lBQXpCLDBCQUF5QixHQUF6QixrQkFBeUI7SUFDM0MsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUNoQixLQUFLLEtBQUs7WUFDTixNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDeEIsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQy9CLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRixJQUFJLFVBQVUsR0FBSTtJQUNkLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsdUJBQU8sQ0FBQyxLQUFLLENBQUM7U0FDVCxJQUFJLENBQUM7UUFDRixpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFFO1FBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNuQixDQUFDLENBQUMsQ0FBQztJQUNSLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3ZCLENBQUMsQ0FBQTtBQUVELElBQUksYUFBYSxHQUFHO0lBQ2hCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDekIsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLENBQUE7SUFHdEMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6Im5wbWNpLnB1Ymxpc2guanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtwcmVwYXJlfSBmcm9tIFwiLi9ucG1jaS5wcmVwYXJlXCI7XHJcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xyXG5pbXBvcnQgKiBhcyBOcG1jaUVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcclxuaW1wb3J0ICogYXMgTnBtY2lCdWlsZERvY2tlciBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xyXG4gICAgc3dpdGNoIChzZXJ2aWNlQXJnKXtcclxuICAgICAgICBjYXNlIFwibnBtXCI6IFxyXG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaE5wbSgpO1xyXG4gICAgICAgIGNhc2UgXCJkb2NrZXJcIjpcclxuICAgICAgICAgICAgcmV0dXJuIHB1Ymxpc2hEb2NrZXIoKTtcclxuICAgIH1cclxufTtcclxuXHJcbmxldCBwdWJsaXNoTnBtICA9IGZ1bmN0aW9uKCl7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgcHJlcGFyZShcIm5wbVwiKVxyXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgIGJhc2goXCJucG0gcHVibGlzaFwiKTtcclxuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cub2soXCJEb25lIVwiKSA7XHJcbiAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgICAgIH0pO1xyXG4gICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59XHJcblxyXG5sZXQgcHVibGlzaERvY2tlciA9IGZ1bmN0aW9uKCl7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgICAgIE5wbWNpQnVpbGREb2NrZXIucmVhZERvY2tlcmZpbGVzKClcclxuICAgICAgICAgICAgXHJcbiAgICAgICAgXHJcbiAgICBkb25lLnJlc29sdmUoKTtcclxuICAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn07Il19 diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index a4b3e8e..4a57d7d 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -31,6 +31,10 @@ export let readDockerfiles = function(){ return done.promise; } +export let getDockerImagesGitlab = function(sortableArrayArg:Dockerfile[]){ + +} + export let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){ let done = plugins.q.defer(); let sortedArray:Dockerfile[] = []; @@ -61,7 +65,6 @@ export let mapDockerfiles = function(sortedArray:Dockerfile[]){ let done = plugins.q.defer(); sortedArray.forEach((dockerfileArg) => { if(dockerfileArg.localBaseImageDependent){ - let dockerfileDependency:Dockerfile; sortedArray.forEach((dockfile2:Dockerfile) => { if(dockfile2.cleanTag == dockerfileArg.baseImage){ dockerfileArg.localBaseDockerfile = dockfile2; @@ -114,30 +117,54 @@ export class Dockerfile { this.localBaseImageDependent = false; }; build(){ - if(!this.buildTag){ - this.patchContents(); - let tag = dockerTag(this.repo,this.version); - bashBare("docker build -t " + tag + " -f " + this.filePath + " ."); - this.buildTag = tag; - NpmciEnv.dockerFilesBuilt.push(this); - this.restoreContents(); - } else { - plugins.beautylog.error("This Dockerfile has already been built!"); - } - + let done = plugins.q.defer(); + this.patchContents(); + let tag = dockerTag(this.repo,this.version); + bashBare("docker build -t " + tag + " -f " + this.filePath + " ."); + this.buildTag = tag; + NpmciEnv.dockerFilesBuilt.push(this); + this.restoreContents(); + done.resolve(); + return done.promise; }; push(){ + let done = plugins.q.defer(); if(this.buildTag){ bashBare("docker push " + this.buildTag); } else { plugins.beautylog.error("Dockerfile hasn't been built yet!"); } + done.resolve(); + return done.promise; } patchContents(){ - + let done = plugins.q.defer(); + if(this.localBaseImageDependent == true){ + 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; }; } diff --git a/ts/npmci.get.ts b/ts/npmci.get.ts deleted file mode 100644 index e69de29..0000000 diff --git a/ts/npmci.publish.ts b/ts/npmci.publish.ts index 26ec6b1..95d0f70 100644 --- a/ts/npmci.publish.ts +++ b/ts/npmci.publish.ts @@ -3,6 +3,7 @@ import * as plugins from "./npmci.plugins"; import {prepare} from "./npmci.prepare"; import {bash} from "./npmci.bash"; import * as NpmciEnv from "./npmci.env"; +import * as NpmciBuildDocker from "./npmci.build.docker" export let publish = (serviceArg:string = "npm") => { switch (serviceArg){ @@ -26,18 +27,9 @@ let publishNpm = function(){ let publishDocker = function(){ let done = plugins.q.defer(); - NpmciEnv.dockerFilesBuilt.forEach(function(dockerfileArg){ - dockerfileArg.push(); - }); + NpmciBuildDocker.readDockerfiles() + + done.resolve(); return done.promise; -}; - -let publishDockerTest = function(){ - let done = plugins.q.defer(); - NpmciEnv.dockerFilesBuilt.forEach(function(dockerfileArg){ - dockerfileArg.push(); - }); - done.resolve(); - return done.promise; -} \ No newline at end of file +}; \ No newline at end of file