now building and pushing Dockerfiles with automatic tag recognition
This commit is contained in:
		
							
								
								
									
										29
									
								
								dist/npmci.build.docker.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										29
									
								
								dist/npmci.build.docker.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/npmci.env.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/npmci.env.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -5,5 +5,5 @@ export declare let repo: GitRepo; | |||||||
| export declare let dockerTestTag: string; | export declare let dockerTestTag: string; | ||||||
| export declare let dockerReleaseTag: string; | export declare let dockerReleaseTag: string; | ||||||
| export declare let dockerRegistry: any; | export declare let dockerRegistry: any; | ||||||
| export declare let dockerImages: any; | export declare let dockerFilesBuilt: Dockerfile[]; | ||||||
| export declare let dockerFiles: Dockerfile[]; | export declare let dockerFiles: Dockerfile[]; | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								dist/npmci.env.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								dist/npmci.env.js
									
									
									
									
										vendored
									
									
								
							| @@ -2,5 +2,7 @@ | |||||||
| require("typings-global"); | require("typings-global"); | ||||||
| var smartstring_1 = require("smartstring"); | var smartstring_1 = require("smartstring"); | ||||||
| exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO); | exports.repo = new smartstring_1.GitRepo(process.env.CI_BUILD_REPO); | ||||||
|  | exports.dockerFilesBuilt = []; | ||||||
|  | exports.dockerFiles = []; | ||||||
|  |  | ||||||
| //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFNckIiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcbmltcG9ydCB7RG9ja2VyZmlsZX0gZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcblxuZXhwb3J0IGxldCByZXBvID0gbmV3IEdpdFJlcG8ocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTyk7XG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xuZXhwb3J0IGxldCBkb2NrZXJSZWxlYXNlVGFnOnN0cmluZztcblxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxuZXhwb3J0IGxldCBkb2NrZXJJbWFnZXM7XG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXTtcblxuIl19 | //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFLOUMsd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcbmltcG9ydCB7RG9ja2VyZmlsZX0gZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcblxuZXhwb3J0IGxldCByZXBvID0gbmV3IEdpdFJlcG8ocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTyk7XG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xuZXhwb3J0IGxldCBkb2NrZXJSZWxlYXNlVGFnOnN0cmluZztcblxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xuZXhwb3J0IGxldCBkb2NrZXJGaWxlczpEb2NrZXJmaWxlW10gPSBbXTtcblxuIl19 | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								dist/npmci.plugins.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								dist/npmci.plugins.d.ts
									
									
									
									
										vendored
									
									
								
							| @@ -2,6 +2,7 @@ import "typings-global"; | |||||||
| export import beautylog = require("beautylog"); | export import beautylog = require("beautylog"); | ||||||
| export declare let commander: any; | export declare let commander: any; | ||||||
| export declare let gulp: any; | export declare let gulp: any; | ||||||
|  | export declare let gulpFunction: any; | ||||||
| export import path = require("path"); | export import path = require("path"); | ||||||
| export declare let q: any; | export declare let q: any; | ||||||
| export declare let request: any; | export declare let request: any; | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								dist/npmci.plugins.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/npmci.plugins.js
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ require("typings-global"); | |||||||
| exports.beautylog = require("beautylog"); | exports.beautylog = require("beautylog"); | ||||||
| exports.commander = require("commander"); | exports.commander = require("commander"); | ||||||
| exports.gulp = require("gulp"); | exports.gulp = require("gulp"); | ||||||
|  | exports.gulpFunction = require("gulp-function"); | ||||||
| exports.path = require("path"); | exports.path = require("path"); | ||||||
| exports.q = require("q"); | exports.q = require("q"); | ||||||
| exports.request = require("request"); | exports.request = require("request"); | ||||||
| @@ -11,4 +12,4 @@ exports.smartssh = require("smartssh"); | |||||||
| exports.smartstring = require("smartstring"); | exports.smartstring = require("smartstring"); | ||||||
| exports.smartfile = require("smartfile"); | exports.smartfile = require("smartfile"); | ||||||
|  |  | ||||||
| //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUNwQixZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDMUIsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5leHBvcnQgaW1wb3J0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XG5leHBvcnQgbGV0IGNvbW1hbmRlciA9IHJlcXVpcmUoXCJjb21tYW5kZXJcIik7XG5leHBvcnQgbGV0IGd1bHAgPSByZXF1aXJlKFwiZ3VscFwiKTtcbmV4cG9ydCBpbXBvcnQgcGF0aCA9IHJlcXVpcmUoXCJwYXRoXCIpO1xuZXhwb3J0IGxldCBxID0gcmVxdWlyZShcInFcIik7XG5leHBvcnQgbGV0IHJlcXVlc3QgPSByZXF1aXJlKFwicmVxdWVzdFwiKTtcbmV4cG9ydCBsZXQgc2hlbGxqcyA9IHJlcXVpcmUoXCJzaGVsbGpzXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydHNzaCA9IHJlcXVpcmUoXCJzbWFydHNzaFwiKTtcbmV4cG9ydCBpbXBvcnQgc21hcnRzdHJpbmcgPSByZXF1aXJlKFwic21hcnRzdHJpbmdcIik7XG5leHBvcnQgaW1wb3J0IHNtYXJ0ZmlsZSA9IHJlcXVpcmUoXCJzbWFydGZpbGVcIik7Il19 | //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUNyQyxZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDMUIsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5leHBvcnQgaW1wb3J0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XG5leHBvcnQgbGV0IGNvbW1hbmRlciA9IHJlcXVpcmUoXCJjb21tYW5kZXJcIik7XG5leHBvcnQgbGV0IGd1bHAgPSByZXF1aXJlKFwiZ3VscFwiKTtcbmV4cG9ydCBsZXQgZ3VscEZ1bmN0aW9uID0gcmVxdWlyZShcImd1bHAtZnVuY3Rpb25cIik7XG5leHBvcnQgaW1wb3J0IHBhdGggPSByZXF1aXJlKFwicGF0aFwiKTtcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xuZXhwb3J0IGxldCByZXF1ZXN0ID0gcmVxdWlyZShcInJlcXVlc3RcIik7XG5leHBvcnQgbGV0IHNoZWxsanMgPSByZXF1aXJlKFwic2hlbGxqc1wiKTtcbmV4cG9ydCBpbXBvcnQgc21hcnRzc2ggPSByZXF1aXJlKFwic21hcnRzc2hcIik7XG5leHBvcnQgaW1wb3J0IHNtYXJ0c3RyaW5nID0gcmVxdWlyZShcInNtYXJ0c3RyaW5nXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydGZpbGUgPSByZXF1aXJlKFwic21hcnRmaWxlXCIpOyJdfQ== | ||||||
|   | |||||||
							
								
								
									
										14
									
								
								dist/npmci.publish.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								dist/npmci.publish.js
									
									
									
									
										vendored
									
									
								
							| @@ -3,6 +3,7 @@ require("typings-global"); | |||||||
| var plugins = require("./npmci.plugins"); | var plugins = require("./npmci.plugins"); | ||||||
| var npmci_prepare_1 = require("./npmci.prepare"); | var npmci_prepare_1 = require("./npmci.prepare"); | ||||||
| var npmci_bash_1 = require("./npmci.bash"); | var npmci_bash_1 = require("./npmci.bash"); | ||||||
|  | var NpmciEnv = require("./npmci.env"); | ||||||
| exports.publish = function (serviceArg) { | exports.publish = function (serviceArg) { | ||||||
|     if (serviceArg === void 0) { serviceArg = "npm"; } |     if (serviceArg === void 0) { serviceArg = "npm"; } | ||||||
|     switch (serviceArg) { |     switch (serviceArg) { | ||||||
| @@ -24,7 +25,18 @@ var publishNpm = function () { | |||||||
| }; | }; | ||||||
| var publishDocker = function () { | var publishDocker = function () { | ||||||
|     var done = plugins.q.defer(); |     var done = plugins.q.defer(); | ||||||
|  |     NpmciEnv.dockerFilesBuilt.forEach(function (dockerfileArg) { | ||||||
|  |         dockerfileArg.push(); | ||||||
|  |     }); | ||||||
|  |     return done.promise; | ||||||
|  | }; | ||||||
|  | var publishDockerTest = function () { | ||||||
|  |     var done = plugins.q.defer(); | ||||||
|  |     NpmciEnv.dockerFilesBuilt.forEach(function (dockerfileArg) { | ||||||
|  |         dockerfileArg.push(); | ||||||
|  |     }); | ||||||
|  |     done.resolve(); | ||||||
|     return done.promise; |     return done.promise; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUd2QixlQUFPLEdBQUcsVUFBQyxVQUF5QjtJQUF6QiwwQkFBeUIsR0FBekIsa0JBQXlCO0lBQzNDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDaEIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3hCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUMvQixDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYsSUFBSSxVQUFVLEdBQUk7SUFDZCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLHVCQUFPLENBQUMsS0FBSyxDQUFDO1NBQ1QsSUFBSSxDQUFDO1FBQ0YsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBRTtRQUMvQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLGFBQWEsR0FBRztJQUNoQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS5wdWJsaXNoLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtwcmVwYXJlfSBmcm9tIFwiLi9ucG1jaS5wcmVwYXJlXCI7XG5pbXBvcnQge2Jhc2h9IGZyb20gXCIuL25wbWNpLmJhc2hcIjtcbmltcG9ydCAqIGFzIGVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcblxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xuICAgIHN3aXRjaCAoc2VydmljZUFyZyl7XG4gICAgICAgIGNhc2UgXCJucG1cIjogXG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaE5wbSgpO1xuICAgICAgICBjYXNlIFwiZG9ja2VyXCI6XG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaERvY2tlcigpO1xuICAgIH1cbn07XG5cbmxldCBwdWJsaXNoTnBtICA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBwcmVwYXJlKFwibnBtXCIpXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICBiYXNoKFwibnBtIHB1Ymxpc2hcIik7XG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5vayhcIkRvbmUhXCIpIDtcbiAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgICAgICB9KTtcbiAgIHJldHVybiBkb25lLnByb21pc2U7XG59XG5cbmxldCBwdWJsaXNoRG9ja2VyID0gZnVuY3Rpb24oKXtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIHJldHVybiBkb25lLnByb21pc2U7XG59OyJdfQ== | //# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyxJQUFZLFFBQVEsV0FBTSxhQUFhLENBQUMsQ0FBQTtBQUU3QixlQUFPLEdBQUcsVUFBQyxVQUF5QjtJQUF6QiwwQkFBeUIsR0FBekIsa0JBQXlCO0lBQzNDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDaEIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3hCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUMvQixDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYsSUFBSSxVQUFVLEdBQUk7SUFDZCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLHVCQUFPLENBQUMsS0FBSyxDQUFDO1NBQ1QsSUFBSSxDQUFDO1FBQ0YsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBRTtRQUMvQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLGFBQWEsR0FBRztJQUNoQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsVUFBUyxhQUFhO1FBQ3BELGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN6QixDQUFDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGLElBQUksaUJBQWlCLEdBQUc7SUFDcEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixRQUFRLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLFVBQVMsYUFBYTtRQUNwRCxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekIsQ0FBQyxDQUFDLENBQUM7SUFDSCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XG5pbXBvcnQgKiBhcyBOcG1jaUVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcblxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xuICAgIHN3aXRjaCAoc2VydmljZUFyZyl7XG4gICAgICAgIGNhc2UgXCJucG1cIjogXG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaE5wbSgpO1xuICAgICAgICBjYXNlIFwiZG9ja2VyXCI6XG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaERvY2tlcigpO1xuICAgIH1cbn07XG5cbmxldCBwdWJsaXNoTnBtICA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBwcmVwYXJlKFwibnBtXCIpXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICBiYXNoKFwibnBtIHB1Ymxpc2hcIik7XG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5vayhcIkRvbmUhXCIpIDtcbiAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgICAgICB9KTtcbiAgIHJldHVybiBkb25lLnByb21pc2U7XG59XG5cbmxldCBwdWJsaXNoRG9ja2VyID0gZnVuY3Rpb24oKXtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIE5wbWNpRW52LmRvY2tlckZpbGVzQnVpbHQuZm9yRWFjaChmdW5jdGlvbihkb2NrZXJmaWxlQXJnKXtcbiAgICAgICAgZG9ja2VyZmlsZUFyZy5wdXNoKCk7XG4gICAgfSk7XG4gICAgcmV0dXJuIGRvbmUucHJvbWlzZTtcbn07XG5cbmxldCBwdWJsaXNoRG9ja2VyVGVzdCA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBOcG1jaUVudi5kb2NrZXJGaWxlc0J1aWx0LmZvckVhY2goZnVuY3Rpb24oZG9ja2VyZmlsZUFyZyl7XG4gICAgICAgIGRvY2tlcmZpbGVBcmcucHVzaCgpO1xuICAgIH0pO1xuICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgIHJldHVybiBkb25lLnByb21pc2U7XG59Il19 | ||||||
|   | |||||||
| @@ -26,6 +26,7 @@ | |||||||
|     "beautylog": "^5.0.8", |     "beautylog": "^5.0.8", | ||||||
|     "commander": "^2.9.0", |     "commander": "^2.9.0", | ||||||
|     "gulp": "^3.9.1", |     "gulp": "^3.9.1", | ||||||
|  |     "gulp-function": "^1.3.5", | ||||||
|     "q": "^1.4.1", |     "q": "^1.4.1", | ||||||
|     "request": "^2.72.0", |     "request": "^2.72.0", | ||||||
|     "shelljs": "^0.7.0", |     "shelljs": "^0.7.0", | ||||||
|   | |||||||
| @@ -3,28 +3,34 @@ import * as NpmciEnv from "./npmci.env"; | |||||||
|  |  | ||||||
|  |  | ||||||
| export let build = function(){ | export let build = function(){ | ||||||
|     let done = plugins.q.defer(); |     let done = plugins.q.defer();; | ||||||
|     done.resolve(); |     plugins.gulp.dest("./Dockerfile*") | ||||||
|  |         .pipe(readDockerfiles) | ||||||
|  |         .pipe(plugins.gulpFunction(done.resolve,"atEnd")); | ||||||
|     return done.promise; |     return done.promise; | ||||||
| } | } | ||||||
|  |  | ||||||
| let readDockerfiles = function(){ | let readDockerfiles = function(){ | ||||||
|     plugins.gulp.dest("./Dockerfile*") |  | ||||||
|         .pipe(makeDockerfiles); |  | ||||||
| }; |  | ||||||
|  |  | ||||||
| let makeDockerfiles = function(){ |  | ||||||
|     return function(file,enc,cb){ |     return function(file,enc,cb){ | ||||||
|         NpmciEnv.dockerFiles.push( |         let myDockerfile = new Dockerfile({ | ||||||
|             new Dockerfile({ |  | ||||||
|             filePath:file.path, |             filePath:file.path, | ||||||
|             read:true |             read:true | ||||||
|             }) |         }); | ||||||
|  |         NpmciEnv.dockerFiles.push( | ||||||
|  |             myDockerfile | ||||||
|         ); |         ); | ||||||
|         cb(); |         file["Dockerfile"] = myDockerfile; | ||||||
|  |         cb(null,file); | ||||||
|     }; |     }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | let buildDockerfiles = function(){ | ||||||
|  |     return function(file,enc,cb){ | ||||||
|  |         file.myDockerfile.build(); | ||||||
|  |         cb(); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
| export class Dockerfile { | export class Dockerfile { | ||||||
|     filePath:string; |     filePath:string; | ||||||
|     buildTag:string; |     buildTag:string; | ||||||
| @@ -42,9 +48,15 @@ export class Dockerfile { | |||||||
|         this.baseImage = dockerBaseImage(this.content); |         this.baseImage = dockerBaseImage(this.content); | ||||||
|     }; |     }; | ||||||
|     build(){ |     build(){ | ||||||
|  |         if(!this.buildTag){ | ||||||
|             let tag = dockerTag(this.repo,this.version); |             let tag = dockerTag(this.repo,this.version); | ||||||
|             plugins.shelljs.exec("docker build -t " + tag + " -f " + this.filePath + " ."); |             plugins.shelljs.exec("docker build -t " + tag + " -f " + this.filePath + " ."); | ||||||
|             this.buildTag = tag; |             this.buildTag = tag; | ||||||
|  |             NpmciEnv.dockerFilesBuilt.push(this); | ||||||
|  |         } else { | ||||||
|  |             plugins.beautylog.error("This Dockerfile already has been built!"); | ||||||
|  |         } | ||||||
|  |          | ||||||
|     }; |     }; | ||||||
|     push(){ |     push(){ | ||||||
|         if(this.buildTag){ |         if(this.buildTag){ | ||||||
|   | |||||||
| @@ -8,6 +8,6 @@ export let dockerTestTag:string; | |||||||
| export let dockerReleaseTag:string; | export let dockerReleaseTag:string; | ||||||
|  |  | ||||||
| export let dockerRegistry; // will be set by npmci.prepare | export let dockerRegistry; // will be set by npmci.prepare | ||||||
| export let dockerImages; | export let dockerFilesBuilt:Dockerfile[] = []; | ||||||
| export let dockerFiles:Dockerfile[]; | export let dockerFiles:Dockerfile[] = []; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ import "typings-global"; | |||||||
| export import beautylog = require("beautylog"); | export import beautylog = require("beautylog"); | ||||||
| export let commander = require("commander"); | export let commander = require("commander"); | ||||||
| export let gulp = require("gulp"); | export let gulp = require("gulp"); | ||||||
|  | export let gulpFunction = require("gulp-function"); | ||||||
| export import path = require("path"); | export import path = require("path"); | ||||||
| export let q = require("q"); | export let q = require("q"); | ||||||
| export let request = require("request"); | export let request = require("request"); | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ import "typings-global"; | |||||||
| import * as plugins from "./npmci.plugins"; | import * as plugins from "./npmci.plugins"; | ||||||
| import {prepare} from "./npmci.prepare"; | import {prepare} from "./npmci.prepare"; | ||||||
| import {bash} from "./npmci.bash"; | import {bash} from "./npmci.bash"; | ||||||
| import * as env from "./npmci.env"; | import * as NpmciEnv from "./npmci.env"; | ||||||
|  |  | ||||||
| export let publish = (serviceArg:string = "npm") => { | export let publish = (serviceArg:string = "npm") => { | ||||||
|     switch (serviceArg){ |     switch (serviceArg){ | ||||||
| @@ -26,5 +26,17 @@ let publishNpm  = function(){ | |||||||
|  |  | ||||||
| let publishDocker = function(){ | let publishDocker = function(){ | ||||||
|     let done = plugins.q.defer(); |     let done = plugins.q.defer(); | ||||||
|  |     NpmciEnv.dockerFilesBuilt.forEach(function(dockerfileArg){ | ||||||
|  |         dockerfileArg.push(); | ||||||
|  |     }); | ||||||
|     return done.promise; |     return done.promise; | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | let publishDockerTest = function(){ | ||||||
|  |     let done = plugins.q.defer(); | ||||||
|  |     NpmciEnv.dockerFilesBuilt.forEach(function(dockerfileArg){ | ||||||
|  |         dockerfileArg.push(); | ||||||
|  |     }); | ||||||
|  |     done.resolve(); | ||||||
|  |     return done.promise; | ||||||
|  | } | ||||||
		Reference in New Issue
	
	Block a user