2.1.30

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 coverage/
-docs/
+docs/
+config.json

dist/npmci.bash.d.ts

@@ -1,3 +1,3 @@
 import "typings-global";
-export declare let bash: (commandArg: any) => void;
-export declare let bashBare: (commandArg: any) => void;
+export declare let bash: (commandArg: string, retryArg?: number) => void;
+export declare let bashBare: (commandArg: any, retryArg?: number) => void;

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;

dist/npmci.env.d.ts

@@ -2,8 +2,10 @@ 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[];
+export declare let config: any;
+export declare let configStore: () => void;
+export declare let configLoad: () => void;

dist/npmci.env.js

@@ -1,8 +1,30 @@
 "use strict";
 require("typings-global");
+var plugins = require("./npmci.plugins");
+var paths = require("./npmci.paths");
 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 = [];
+exports.configStore = function () {
+    plugins.smartfile.memory.toFsSync(JSON.stringify(exports.config), {
+        fileName: "config.json",
+        filePath: paths.NpmciPackageRoot
+    });
+};
+exports.configLoad = function () {
+    try {
+        exports.config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
+    }
+    catch (err) {
+        exports.config = {};
+        exports.configStore();
+        plugins.beautylog.log("config inititialized!");
+    }
+    exports.config.dockerRegistry ? exports.dockerRegistry = exports.config.dockerRegistry : void (0);
+    exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
+};
+exports.configLoad();
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFLOUMsd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7R2l0UmVwb30gZnJvbSBcInNtYXJ0c3RyaW5nXCI7XHJcbmltcG9ydCB7RG9ja2VyZmlsZX0gZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcclxuXHJcbmV4cG9ydCBsZXQgcmVwbyA9IG5ldyBHaXRSZXBvKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xyXG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xyXG5leHBvcnQgbGV0IGRvY2tlclJlbGVhc2VUYWc6c3RyaW5nO1xyXG5cclxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzQnVpbHQ6RG9ja2VyZmlsZVtdID0gW107XHJcbmV4cG9ydCBsZXQgZG9ja2VyRmlsZXM6RG9ja2VyZmlsZVtdID0gW107XHJcblxyXG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBR3pCLFlBQUksR0FBVyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUV0RCxrQkFBVSxHQUFVLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDO0FBSS9DLHdCQUFnQixHQUFnQixFQUFFLENBQUM7QUFDbkMsbUJBQVcsR0FBZ0IsRUFBRSxDQUFDO0FBSTlCLG1CQUFXLEdBQUc7SUFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUM3QixJQUFJLENBQUMsU0FBUyxDQUFDLGNBQU0sQ0FBQyxFQUN0QjtRQUNJLFFBQVEsRUFBQyxhQUFhO1FBQ3RCLFFBQVEsRUFBQyxLQUFLLENBQUMsZ0JBQWdCO0tBQ2xDLENBQ0osQ0FBQztBQUNOLENBQUMsQ0FBQTtBQUVVLGtCQUFVLEdBQUc7SUFDcEIsSUFBSSxDQUFDO1FBQ0QsY0FBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkYsQ0FDQTtJQUFBLEtBQUssQ0FBQSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUM7UUFDUCxjQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ1osbUJBQVcsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxHQUFHLGNBQU0sQ0FBQyxjQUFjLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pFLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyx3QkFBZ0IsR0FBRyxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ25GLENBQUMsQ0FBQTtBQUNELGtCQUFVLEVBQUUsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0ICogYXMgcGF0aHMgZnJvbSBcIi4vbnBtY2kucGF0aHNcIjtcclxuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcclxuaW1wb3J0IHtEb2NrZXJmaWxlfSBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCByZXBvOkdpdFJlcG8gPSBuZXcgR2l0UmVwbyhwcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPKTtcclxuXHJcbmV4cG9ydCBsZXQgYnVpbGRTdGFnZTpzdHJpbmcgPSBwcm9jZXNzLmVudi5DSV9CVUlMRF9TVEFHRTtcclxuXHJcbi8vIGhhbmRsaW5nIGNvbmZpZyBiZXR3ZWVuIGNvbW1hbmRzXHJcbmV4cG9ydCBsZXQgZG9ja2VyUmVnaXN0cnk7IC8vIHdpbGwgYmUgc2V0IGJ5IG5wbWNpLnByZXBhcmVcclxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5cclxuZXhwb3J0IGxldCBjb25maWc7XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ1N0b3JlID0gKCkgPT4ge1xyXG4gICAgcGx1Z2lucy5zbWFydGZpbGUubWVtb3J5LnRvRnNTeW5jKFxyXG4gICAgICAgIEpTT04uc3RyaW5naWZ5KGNvbmZpZyksXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgICBmaWxlTmFtZTpcImNvbmZpZy5qc29uXCIsXHJcbiAgICAgICAgICAgIGZpbGVQYXRoOnBhdGhzLk5wbWNpUGFja2FnZVJvb3RcclxuICAgICAgICB9XHJcbiAgICApO1xyXG59XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ0xvYWQgPSAoKSA9PiB7XHJcbiAgICB0cnkge1xyXG4gICAgICAgIGNvbmZpZyA9IHBsdWdpbnMuc21hcnRmaWxlLmxvY2FsLnRvT2JqZWN0U3luYyhwYXRocy5OcG1jaVBhY2thZ2VDb25maWcsXCJqc29uXCIpO1xyXG4gICAgfVxyXG4gICAgY2F0Y2goZXJyKXtcclxuICAgICAgICBjb25maWcgPSB7fTtcclxuICAgICAgICBjb25maWdTdG9yZSgpO1xyXG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcImNvbmZpZyBpbml0aXRpYWxpemVkIVwiKTtcclxuICAgIH1cclxuICAgIFxyXG4gICAgY29uZmlnLmRvY2tlclJlZ2lzdHJ5ID8gZG9ja2VyUmVnaXN0cnkgPSBjb25maWcuZG9ja2VyUmVnaXN0cnkgOiB2b2lkKDApO1xyXG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xyXG59XHJcbmNvbmZpZ0xvYWQoKTsiXX0=

dist/npmci.get.js

@@ -1,3 +0,0 @@
-
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJucG1jaS5nZXQuanMiLCJzb3VyY2VzQ29udGVudCI6W119

dist/npmci.paths.d.ts

@@ -0,0 +1,4 @@
+import "typings-global";
+export declare let cwd: string;
+export declare let NpmciPackageRoot: string;
+export declare let NpmciPackageConfig: string;

dist/npmci.paths.js

@@ -0,0 +1,8 @@
+"use strict";
+require("typings-global");
+var plugins = require("./npmci.plugins");
+exports.cwd = process.cwd();
+exports.NpmciPackageRoot = plugins.path.join(__dirname, "../");
+exports.NpmciPackageConfig = plugins.path.join(exports.NpmciPackageRoot, "./config.json");
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsSUFBWSxPQUFPLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUVoQyxXQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBRXBCLHdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQztBQUN0RCwwQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBZ0IsRUFBQyxlQUFlLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS5wYXRocy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xyXG5cclxuZXhwb3J0IGxldCBjd2QgPSBwcm9jZXNzLmN3ZCgpO1xyXG5cclxuZXhwb3J0IGxldCBOcG1jaVBhY2thZ2VSb290ID0gcGx1Z2lucy5wYXRoLmpvaW4oX19kaXJuYW1lLFwiLi4vXCIpO1xyXG5leHBvcnQgbGV0IE5wbWNpUGFja2FnZUNvbmZpZyA9IHBsdWdpbnMucGF0aC5qb2luKE5wbWNpUGFja2FnZVJvb3QsXCIuL2NvbmZpZy5qc29uXCIpIl19

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.1.27",
+  "version": "2.1.30",
   "description": "",
   "main": "dist/index.js",
   "bin": {

ts/npmci.bash.ts

@@ -1,25 +1,39 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
-export let bash = (commandArg) => {
+export let bash = (commandArg:string,retryArg = 2) => {
     if(!process.env.NPMTS_TEST){
-        let exitCode = plugins.shelljs.exec(
-            "bash -c \"source /usr/local/nvm/nvm.sh &&" +
-            commandArg +
-            "\""
-        ).code;
-        if(exitCode !== 0){
-            process.exit(1);
+        for (let i = 0; i <= retryArg; i++){
+            let exitCode:number = plugins.shelljs.exec(
+                "bash -c \"source /usr/local/nvm/nvm.sh &&" +
+                commandArg +
+                "\""
+            ).code;
+            if(exitCode !== 0 && i == retryArg){
+                process.exit(1);
+            } else if(exitCode == 0){
+                i = retryArg + 1; // if everything works out ok retrials are not wanted
+            } else {
+                plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString);
+                plugins.beautylog.info("Retry " + (i + 1).toString + " of " +  retryArg.toString);
+            }
         }
     } else {
         plugins.beautylog.log("ShellExec would be: " + commandArg.blue)
     }
 }
 
-export let bashBare = (commandArg) => {
+export let bashBare = (commandArg,retryArg = 2) => {
     if (!process.env.NPMTS_TEST){
-        let exitCode = plugins.shelljs.exec(commandArg).code;
-        if(exitCode !== 0){
-            process.exit(1);
+        for(let i = 0; i <= retryArg; i++){
+            let exitCode:number = plugins.shelljs.exec(commandArg).code;
+            if(exitCode !== 0 && i == retryArg){
+                process.exit(1);
+            } else if(exitCode == 0){
+                i = retryArg + 1; // if everything works out ok retrials are not wanted
+            } else {
+                plugins.beautylog.warn("Something went wrong! Exit Code: " + exitCode.toString);
+                plugins.beautylog.info("Retry " + (i + 1).toString + " of " +  retryArg.toString);
+            }
         }
     } else {
         plugins.beautylog.log("ShellExec would be: " + commandArg.blue)

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;
     };
 }
 
@@ -162,12 +189,12 @@ export let dockerBaseImage = function(dockerfileContentArg:string){
 export let dockerTag = function(repoArg:string,versionArg:string):string{
     let tagString:string;
     let 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";
     } 
     let repo = repoArg;
     let 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;

ts/npmci.env.ts

@@ -1,13 +1,41 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
+import * as paths from "./npmci.paths";
 import {GitRepo} from "smartstring";
 import {Dockerfile} from "./npmci.build.docker"
 
-export let repo = new GitRepo(process.env.CI_BUILD_REPO);
-export let dockerTestTag:string;
-export let dockerReleaseTag:string;
+export let repo:GitRepo = new GitRepo(process.env.CI_BUILD_REPO);
 
+export let buildStage:string = process.env.CI_BUILD_STAGE;
+
+// handling config between commands
 export let dockerRegistry; // will be set by npmci.prepare
 export let dockerFilesBuilt:Dockerfile[] = [];
 export let dockerFiles:Dockerfile[] = [];
 
+export let config;
+
+export let configStore = () => {
+    plugins.smartfile.memory.toFsSync(
+        JSON.stringify(config),
+        {
+            fileName:"config.json",
+            filePath:paths.NpmciPackageRoot
+        }
+    );
+}
+
+export let configLoad = () => {
+    try {
+        config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig,"json");
+    }
+    catch(err){
+        config = {};
+        configStore();
+        plugins.beautylog.log("config inititialized!");
+    }
+    
+    config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void(0);
+    config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void(0);
+}
+configLoad();

ts/npmci.paths.ts

@@ -0,0 +1,7 @@
+import "typings-global";
+import * as plugins from "./npmci.plugins";
+
+export let cwd = process.cwd();
+
+export let NpmciPackageRoot = plugins.path.join(__dirname,"../");
+export let NpmciPackageConfig = plugins.path.join(NpmciPackageRoot,"./config.json")

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;
-}
+};