2.1.48

dist/index.js

@@ -10,6 +10,7 @@ var npmci_publish_1 = require("./npmci.publish");
 var npmci_prepare_1 = require("./npmci.prepare");
 var npmci_test_1 = require("./npmci.test");
 var npmci_trigger_1 = require("./npmci.trigger");
+var NpmciEnv = require("./npmci.env");
 var command;
 var commandOption;
 plugins.commander
@@ -25,19 +26,27 @@ if (typeof command === 'undefined') {
 }
 switch (command) {
     case "build":
-        npmci_build_1.build(commandOption);
+        npmci_build_1.build(commandOption)
+            .then(NpmciEnv.configStore);
         break;
     case "install":
-        npmci_install_1.install(commandOption);
+        npmci_install_1.install(commandOption)
+            .then(NpmciEnv.configStore);
+        ;
         break;
     case "prepare":
-        npmci_prepare_1.prepare(commandOption);
+        npmci_prepare_1.prepare(commandOption)
+            .then(NpmciEnv.configStore);
+        ;
         break;
     case "publish":
-        npmci_publish_1.publish(commandOption);
+        npmci_publish_1.publish(commandOption)
+            .then(NpmciEnv.configStore);
+        ;
         break;
     case "test":
-        npmci_test_1.test(commandOption);
+        npmci_test_1.test(commandOption)
+            .then(NpmciEnv.configStore);
         break;
     case "trigger":
         npmci_trigger_1.trigger();
@@ -46,4 +55,4 @@ switch (command) {
         break;
 }
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFM0MsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFFMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELDRCQUFvQixlQUNwQixDQUFDLENBRGtDO0FBQ25DLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBRXhDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUd4QyxJQUFJLE9BQU8sQ0FBQztBQUNaLElBQUksYUFBYSxDQUFDO0FBRWxCLE9BQU8sQ0FBQyxTQUFTO0tBQ1osU0FBUyxDQUFDLGlDQUFpQyxDQUFDO0tBQzVDLE1BQU0sQ0FBQyxVQUFVLFVBQVUsRUFBRSxnQkFBZ0I7SUFDMUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUNyQixhQUFhLEdBQUcsZ0JBQWdCLENBQUM7QUFDckMsQ0FBQyxDQUFDLENBQUM7QUFFUCxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEMsRUFBRSxDQUFDLENBQUMsT0FBTyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwQixDQUFDO0FBRUQsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUEsQ0FBQztJQUNiLEtBQUssT0FBTztRQUNSLG1CQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDckIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxTQUFTO1FBQ1YsdUJBQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN2QixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3ZCLEtBQUssQ0FBQztJQUNWLEtBQUssU0FBUztRQUNWLHVCQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDdkIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxNQUFNO1FBQ1AsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxFQUFFLENBQUM7UUFDVixLQUFLLENBQUM7SUFDVjtRQUNJLEtBQUssQ0FBQztBQUNkLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyIjIS91c3IvYmluL2VudiBub2RlXHJcbmltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xyXG5cclxubGV0IHBhY2tKc29uID0gcmVxdWlyZShcIi4uL3BhY2thZ2UuanNvblwiKTtcclxuXHJcbnBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJucG1jaSB2ZXJzaW9uOiBcIiArIHBhY2tKc29uLnZlcnNpb24pO1xyXG5cclxuaW1wb3J0IHtidWlsZH0gZnJvbSBcIi4vbnBtY2kuYnVpbGRcIlxyXG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcclxuaW1wb3J0IHtwdWJsaXNofSBmcm9tIFwiLi9ucG1jaS5wdWJsaXNoXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge3RhZywgcmV0YWd9IGZyb20gXCIuL25wbWNpLnRhZ1wiO1xyXG5pbXBvcnQge3Rlc3R9IGZyb20gXCIuL25wbWNpLnRlc3RcIjtcclxuaW1wb3J0IHt0cmlnZ2VyfSBmcm9tIFwiLi9ucG1jaS50cmlnZ2VyXCI7XHJcblxyXG5cclxubGV0IGNvbW1hbmQ7XHJcbmxldCBjb21tYW5kT3B0aW9uO1xyXG5cclxucGx1Z2lucy5jb21tYW5kZXJcclxuICAgIC5hcmd1bWVudHMoJzxjb21tYW5kYXJnPiBbY29tbWFuZG9wdGlvbmFyZ10nKVxyXG4gICAgLmFjdGlvbihmdW5jdGlvbiAoY29tbWFuZGFyZywgY29tbWFuZG9wdGlvbmFyZykge1xyXG4gICAgICAgIGNvbW1hbmQgPSBjb21tYW5kYXJnO1xyXG4gICAgICAgIGNvbW1hbmRPcHRpb24gPSBjb21tYW5kb3B0aW9uYXJnO1xyXG4gICAgfSk7XHJcbiBcclxucGx1Z2lucy5jb21tYW5kZXIucGFyc2UocHJvY2Vzcy5hcmd2KTtcclxuIFxyXG5pZiAodHlwZW9mIGNvbW1hbmQgPT09ICd1bmRlZmluZWQnKSB7XHJcbiAgICBjb25zb2xlLmVycm9yKCdubyBjb21tYW5kIGdpdmVuIScpO1xyXG4gICAgcHJvY2Vzcy5leGl0KDEpO1xyXG59XHJcblxyXG5zd2l0Y2ggKGNvbW1hbmQpe1xyXG4gICAgY2FzZSBcImJ1aWxkXCI6XHJcbiAgICAgICAgYnVpbGQoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwiaW5zdGFsbFwiOlxyXG4gICAgICAgIGluc3RhbGwoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHJlcGFyZVwiOlxyXG4gICAgICAgIHByZXBhcmUoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHVibGlzaFwiOlxyXG4gICAgICAgIHB1Ymxpc2goY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidGVzdFwiOlxyXG4gICAgICAgIHRlc3QoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidHJpZ2dlclwiOlxyXG4gICAgICAgIHRyaWdnZXIoKTtcclxuICAgICAgICBicmVhaztcclxuICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgYnJlYWs7XHJcbn1cclxuXHJcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFM0MsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFFMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELDRCQUFvQixlQUNwQixDQUFDLENBRGtDO0FBQ25DLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBRXhDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4QyxJQUFZLFFBQVEsV0FBTSxhQUFhLENBQUMsQ0FBQTtBQUd4QyxJQUFJLE9BQU8sQ0FBQztBQUNaLElBQUksYUFBYSxDQUFDO0FBRWxCLE9BQU8sQ0FBQyxTQUFTO0tBQ1osU0FBUyxDQUFDLGlDQUFpQyxDQUFDO0tBQzVDLE1BQU0sQ0FBQyxVQUFVLFVBQVUsRUFBRSxnQkFBZ0I7SUFDMUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUNyQixhQUFhLEdBQUcsZ0JBQWdCLENBQUM7QUFDckMsQ0FBQyxDQUFDLENBQUM7QUFFUCxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEMsRUFBRSxDQUFDLENBQUMsT0FBTyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwQixDQUFDO0FBRUQsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUEsQ0FBQztJQUNiLEtBQUssT0FBTztRQUNSLG1CQUFLLENBQUMsYUFBYSxDQUFDO2FBQ2YsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNoQyxLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQzthQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQUEsQ0FBQztRQUNqQyxLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQzthQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQUEsQ0FBQztRQUNqQyxLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQzthQUNqQixJQUFJLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1FBQUEsQ0FBQztRQUNqQyxLQUFLLENBQUM7SUFDVixLQUFLLE1BQU07UUFDUCxpQkFBSSxDQUFDLGFBQWEsQ0FBQzthQUNkLElBQUksQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDaEMsS0FBSyxDQUFDO0lBQ1YsS0FBSyxTQUFTO1FBQ1YsdUJBQU8sRUFBRSxDQUFDO1FBQ1YsS0FBSyxDQUFDO0lBQ1Y7UUFDSSxLQUFLLENBQUM7QUFDZCxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiIyEvdXNyL2Jpbi9lbnYgbm9kZVxyXG5pbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuXHJcbmxldCBwYWNrSnNvbiA9IHJlcXVpcmUoXCIuLi9wYWNrYWdlLmpzb25cIik7XHJcblxyXG5wbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwibnBtY2kgdmVyc2lvbjogXCIgKyBwYWNrSnNvbi52ZXJzaW9uKTtcclxuXHJcbmltcG9ydCB7YnVpbGR9IGZyb20gXCIuL25wbWNpLmJ1aWxkXCJcclxuaW1wb3J0IHtpbnN0YWxsfSBmcm9tIFwiLi9ucG1jaS5pbnN0YWxsXCI7XHJcbmltcG9ydCB7cHVibGlzaH0gZnJvbSBcIi4vbnBtY2kucHVibGlzaFwiO1xyXG5pbXBvcnQge3ByZXBhcmV9IGZyb20gXCIuL25wbWNpLnByZXBhcmVcIjtcclxuaW1wb3J0IHt0YWcsIHJldGFnfSBmcm9tIFwiLi9ucG1jaS50YWdcIjtcclxuaW1wb3J0IHt0ZXN0fSBmcm9tIFwiLi9ucG1jaS50ZXN0XCI7XHJcbmltcG9ydCB7dHJpZ2dlcn0gZnJvbSBcIi4vbnBtY2kudHJpZ2dlclwiO1xyXG5pbXBvcnQgKiBhcyBOcG1jaUVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcclxuXHJcblxyXG5sZXQgY29tbWFuZDtcclxubGV0IGNvbW1hbmRPcHRpb247XHJcblxyXG5wbHVnaW5zLmNvbW1hbmRlclxyXG4gICAgLmFyZ3VtZW50cygnPGNvbW1hbmRhcmc+IFtjb21tYW5kb3B0aW9uYXJnXScpXHJcbiAgICAuYWN0aW9uKGZ1bmN0aW9uIChjb21tYW5kYXJnLCBjb21tYW5kb3B0aW9uYXJnKSB7XHJcbiAgICAgICAgY29tbWFuZCA9IGNvbW1hbmRhcmc7XHJcbiAgICAgICAgY29tbWFuZE9wdGlvbiA9IGNvbW1hbmRvcHRpb25hcmc7XHJcbiAgICB9KTtcclxuIFxyXG5wbHVnaW5zLmNvbW1hbmRlci5wYXJzZShwcm9jZXNzLmFyZ3YpO1xyXG4gXHJcbmlmICh0eXBlb2YgY29tbWFuZCA9PT0gJ3VuZGVmaW5lZCcpIHtcclxuICAgIGNvbnNvbGUuZXJyb3IoJ25vIGNvbW1hbmQgZ2l2ZW4hJyk7XHJcbiAgICBwcm9jZXNzLmV4aXQoMSk7XHJcbn1cclxuXHJcbnN3aXRjaCAoY29tbWFuZCl7XHJcbiAgICBjYXNlIFwiYnVpbGRcIjpcclxuICAgICAgICBidWlsZChjb21tYW5kT3B0aW9uKVxyXG4gICAgICAgICAgICAudGhlbihOcG1jaUVudi5jb25maWdTdG9yZSk7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwiaW5zdGFsbFwiOlxyXG4gICAgICAgIGluc3RhbGwoY29tbWFuZE9wdGlvbilcclxuICAgICAgICAgICAgLnRoZW4oTnBtY2lFbnYuY29uZmlnU3RvcmUpOztcclxuICAgICAgICBicmVhaztcclxuICAgIGNhc2UgXCJwcmVwYXJlXCI6XHJcbiAgICAgICAgcHJlcGFyZShjb21tYW5kT3B0aW9uKVxyXG4gICAgICAgICAgICAudGhlbihOcG1jaUVudi5jb25maWdTdG9yZSk7O1xyXG4gICAgICAgIGJyZWFrO1xyXG4gICAgY2FzZSBcInB1Ymxpc2hcIjpcclxuICAgICAgICBwdWJsaXNoKGNvbW1hbmRPcHRpb24pXHJcbiAgICAgICAgICAgIC50aGVuKE5wbWNpRW52LmNvbmZpZ1N0b3JlKTs7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidGVzdFwiOlxyXG4gICAgICAgIHRlc3QoY29tbWFuZE9wdGlvbilcclxuICAgICAgICAgICAgLnRoZW4oTnBtY2lFbnYuY29uZmlnU3RvcmUpO1xyXG4gICAgICAgIGJyZWFrO1xyXG4gICAgY2FzZSBcInRyaWdnZXJcIjpcclxuICAgICAgICB0cmlnZ2VyKCk7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBkZWZhdWx0OlxyXG4gICAgICAgIGJyZWFrO1xyXG59XHJcblxyXG4iXX0=

dist/npmci.build.docker.d.ts

@@ -4,19 +4,19 @@ 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 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;
+    push(stageArg: any): any;
-    pull(): void;
+    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[];

dist/npmci.env.d.ts

@@ -6,6 +6,5 @@ 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

@@ -8,23 +8,29 @@ exports.buildStage = process.env.CI_BUILD_STAGE;
 exports.dockerFilesBuilt = [];
 exports.dockerFiles = [];
 exports.configStore = function () {
-    plugins.smartfile.memory.toFsSync(JSON.stringify(exports.config), {
+    var config = {
+        dockerRegistry: exports.dockerRegistry,
+        dockerFilesBuilt: exports.dockerFilesBuilt,
+        dockerFiles: exports.dockerFiles
+    };
+    plugins.smartfile.memory.toFsSync(JSON.stringify(config), {
         fileName: "config.json",
         filePath: paths.NpmciPackageRoot
     });
 };
 exports.configLoad = function () {
+    var config;
     try {
-        exports.config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
+        config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
     }
     catch (err) {
-        exports.config = {};
+        config = {};
         exports.configStore();
-        plugins.beautylog.log("config inititialized!");
+        plugins.beautylog.log("config initialized!");
     }
-    exports.config.dockerRegistry ? exports.dockerRegistry = exports.config.dockerRegistry : void (0);
+    config.dockerRegistry ? exports.dockerRegistry = config.dockerRegistry : void (0);
-    exports.config.dockerFilesBuilt ? exports.dockerFilesBuilt = exports.config.dockerFilesBuilt : void (0);
+    config.dockerFilesBuilt ? exports.dockerFilesBuilt = config.dockerFilesBuilt : void (0);
 };
 exports.configLoad();
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBR3pCLFlBQUksR0FBVyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUV0RCxrQkFBVSxHQUFVLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDO0FBSS9DLHdCQUFnQixHQUFnQixFQUFFLENBQUM7QUFDbkMsbUJBQVcsR0FBZ0IsRUFBRSxDQUFDO0FBSTlCLG1CQUFXLEdBQUc7SUFDckIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUM3QixJQUFJLENBQUMsU0FBUyxDQUFDLGNBQU0sQ0FBQyxFQUN0QjtRQUNJLFFBQVEsRUFBQyxhQUFhO1FBQ3RCLFFBQVEsRUFBQyxLQUFLLENBQUMsZ0JBQWdCO0tBQ2xDLENBQ0osQ0FBQztBQUNOLENBQUMsQ0FBQTtBQUVVLGtCQUFVLEdBQUc7SUFDcEIsSUFBSSxDQUFDO1FBQ0QsY0FBTSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUMsTUFBTSxDQUFDLENBQUM7SUFDbkYsQ0FDQTtJQUFBLEtBQUssQ0FBQSxDQUFDLEdBQUcsQ0FBQyxDQUFBLENBQUM7UUFDUCxjQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ1osbUJBQVcsRUFBRSxDQUFDO1FBQ2QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRUQsY0FBTSxDQUFDLGNBQWMsR0FBRyxzQkFBYyxHQUFHLGNBQU0sQ0FBQyxjQUFjLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pFLGNBQU0sQ0FBQyxnQkFBZ0IsR0FBRyx3QkFBZ0IsR0FBRyxjQUFNLENBQUMsZ0JBQWdCLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ25GLENBQUMsQ0FBQTtBQUNELGtCQUFVLEVBQUUsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0ICogYXMgcGF0aHMgZnJvbSBcIi4vbnBtY2kucGF0aHNcIjtcclxuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcclxuaW1wb3J0IHtEb2NrZXJmaWxlfSBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCByZXBvOkdpdFJlcG8gPSBuZXcgR2l0UmVwbyhwcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPKTtcclxuXHJcbmV4cG9ydCBsZXQgYnVpbGRTdGFnZTpzdHJpbmcgPSBwcm9jZXNzLmVudi5DSV9CVUlMRF9TVEFHRTtcclxuXHJcbi8vIGhhbmRsaW5nIGNvbmZpZyBiZXR3ZWVuIGNvbW1hbmRzXHJcbmV4cG9ydCBsZXQgZG9ja2VyUmVnaXN0cnk7IC8vIHdpbGwgYmUgc2V0IGJ5IG5wbWNpLnByZXBhcmVcclxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5cclxuZXhwb3J0IGxldCBjb25maWc7XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ1N0b3JlID0gKCkgPT4ge1xyXG4gICAgcGx1Z2lucy5zbWFydGZpbGUubWVtb3J5LnRvRnNTeW5jKFxyXG4gICAgICAgIEpTT04uc3RyaW5naWZ5KGNvbmZpZyksXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgICBmaWxlTmFtZTpcImNvbmZpZy5qc29uXCIsXHJcbiAgICAgICAgICAgIGZpbGVQYXRoOnBhdGhzLk5wbWNpUGFja2FnZVJvb3RcclxuICAgICAgICB9XHJcbiAgICApO1xyXG59XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ0xvYWQgPSAoKSA9PiB7XHJcbiAgICB0cnkge1xyXG4gICAgICAgIGNvbmZpZyA9IHBsdWdpbnMuc21hcnRmaWxlLmxvY2FsLnRvT2JqZWN0U3luYyhwYXRocy5OcG1jaVBhY2thZ2VDb25maWcsXCJqc29uXCIpO1xyXG4gICAgfVxyXG4gICAgY2F0Y2goZXJyKXtcclxuICAgICAgICBjb25maWcgPSB7fTtcclxuICAgICAgICBjb25maWdTdG9yZSgpO1xyXG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcImNvbmZpZyBpbml0aXRpYWxpemVkIVwiKTtcclxuICAgIH1cclxuICAgIFxyXG4gICAgY29uZmlnLmRvY2tlclJlZ2lzdHJ5ID8gZG9ja2VyUmVnaXN0cnkgPSBjb25maWcuZG9ja2VyUmVnaXN0cnkgOiB2b2lkKDApO1xyXG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xyXG59XHJcbmNvbmZpZ0xvYWQoKTsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBR3pCLFlBQUksR0FBVyxJQUFJLHFCQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztBQUV0RCxrQkFBVSxHQUFVLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDO0FBSS9DLHdCQUFnQixHQUFnQixFQUFFLENBQUM7QUFDbkMsbUJBQVcsR0FBZ0IsRUFBRSxDQUFDO0FBRTlCLG1CQUFXLEdBQUc7SUFDckIsSUFBSSxNQUFNLEdBQUc7UUFDVCxjQUFjLEVBQUUsc0JBQWM7UUFDOUIsZ0JBQWdCLEVBQUUsd0JBQWdCO1FBQ2xDLFdBQVcsRUFBRSxtQkFBVztLQUMzQixDQUFBO0lBQ0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUM3QixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUN0QjtRQUNJLFFBQVEsRUFBQyxhQUFhO1FBQ3RCLFFBQVEsRUFBQyxLQUFLLENBQUMsZ0JBQWdCO0tBQ2xDLENBQ0osQ0FBQztBQUNOLENBQUMsQ0FBQTtBQUVVLGtCQUFVLEdBQUc7SUFDcEIsSUFBSSxNQUFNLENBQUM7SUFDWCxJQUFJLENBQUM7UUFDRCxNQUFNLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBQyxNQUFNLENBQUMsQ0FBQztJQUNuRixDQUNBO0lBQUEsS0FBSyxDQUFBLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQztRQUNQLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFDWixtQkFBVyxFQUFFLENBQUM7UUFDZCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxNQUFNLENBQUMsY0FBYyxHQUFHLHNCQUFjLEdBQUcsTUFBTSxDQUFDLGNBQWMsR0FBRyxLQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDekUsTUFBTSxDQUFDLGdCQUFnQixHQUFHLHdCQUFnQixHQUFHLE1BQU0sQ0FBQyxnQkFBZ0IsR0FBRyxLQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDbkYsQ0FBQyxDQUFBO0FBQ0Qsa0JBQVUsRUFBRSxDQUFDIiwiZmlsZSI6Im5wbWNpLmVudi5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBwYXRocyBmcm9tIFwiLi9ucG1jaS5wYXRoc1wiO1xyXG5pbXBvcnQge0dpdFJlcG99IGZyb20gXCJzbWFydHN0cmluZ1wiO1xyXG5pbXBvcnQge0RvY2tlcmZpbGV9IGZyb20gXCIuL25wbWNpLmJ1aWxkLmRvY2tlclwiXHJcblxyXG5leHBvcnQgbGV0IHJlcG86R2l0UmVwbyA9IG5ldyBHaXRSZXBvKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xyXG5cclxuZXhwb3J0IGxldCBidWlsZFN0YWdlOnN0cmluZyA9IHByb2Nlc3MuZW52LkNJX0JVSUxEX1NUQUdFO1xyXG5cclxuLy8gaGFuZGxpbmcgY29uZmlnIGJldHdlZW4gY29tbWFuZHNcclxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzQnVpbHQ6RG9ja2VyZmlsZVtdID0gW107XHJcbmV4cG9ydCBsZXQgZG9ja2VyRmlsZXM6RG9ja2VyZmlsZVtdID0gW107XHJcblxyXG5leHBvcnQgbGV0IGNvbmZpZ1N0b3JlID0gKCkgPT4ge1xyXG4gICAgbGV0IGNvbmZpZyA9IHtcclxuICAgICAgICBkb2NrZXJSZWdpc3RyeTogZG9ja2VyUmVnaXN0cnksXHJcbiAgICAgICAgZG9ja2VyRmlsZXNCdWlsdDogZG9ja2VyRmlsZXNCdWlsdCxcclxuICAgICAgICBkb2NrZXJGaWxlczogZG9ja2VyRmlsZXNcclxuICAgIH1cclxuICAgIHBsdWdpbnMuc21hcnRmaWxlLm1lbW9yeS50b0ZzU3luYyhcclxuICAgICAgICBKU09OLnN0cmluZ2lmeShjb25maWcpLFxyXG4gICAgICAgIHtcclxuICAgICAgICAgICAgZmlsZU5hbWU6XCJjb25maWcuanNvblwiLFxyXG4gICAgICAgICAgICBmaWxlUGF0aDpwYXRocy5OcG1jaVBhY2thZ2VSb290XHJcbiAgICAgICAgfVxyXG4gICAgKTtcclxufVxyXG5cclxuZXhwb3J0IGxldCBjb25maWdMb2FkID0gKCkgPT4ge1xyXG4gICAgbGV0IGNvbmZpZztcclxuICAgIHRyeSB7XHJcbiAgICAgICAgY29uZmlnID0gcGx1Z2lucy5zbWFydGZpbGUubG9jYWwudG9PYmplY3RTeW5jKHBhdGhzLk5wbWNpUGFja2FnZUNvbmZpZyxcImpzb25cIik7XHJcbiAgICB9XHJcbiAgICBjYXRjaChlcnIpe1xyXG4gICAgICAgIGNvbmZpZyA9IHt9O1xyXG4gICAgICAgIGNvbmZpZ1N0b3JlKCk7XHJcbiAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cubG9nKFwiY29uZmlnIGluaXRpYWxpemVkIVwiKTtcclxuICAgIH1cclxuICAgIFxyXG4gICAgY29uZmlnLmRvY2tlclJlZ2lzdHJ5ID8gZG9ja2VyUmVnaXN0cnkgPSBjb25maWcuZG9ja2VyUmVnaXN0cnkgOiB2b2lkKDApO1xyXG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xyXG59XHJcbmNvbmZpZ0xvYWQoKTsiXX0=

package.json

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

ts/index.ts

@@ -13,6 +13,7 @@ import {prepare} from "./npmci.prepare";
 import {tag, retag} from "./npmci.tag";
 import {test} from "./npmci.test";
 import {trigger} from "./npmci.trigger";
+import * as NpmciEnv from "./npmci.env";
 
 
 let command;
@@ -34,19 +35,24 @@ if (typeof command === 'undefined') {
 
 switch (command){
     case "build":
-        build(commandOption);
+        build(commandOption)
+            .then(NpmciEnv.configStore);
         break;
     case "install":
-        install(commandOption);
+        install(commandOption)
+            .then(NpmciEnv.configStore);;
         break;
     case "prepare":
-        prepare(commandOption);
+        prepare(commandOption)
+            .then(NpmciEnv.configStore);;
         break;
     case "publish":
-        publish(commandOption);
+        publish(commandOption)
+            .then(NpmciEnv.configStore);;
         break;
     case "test":
-        test(commandOption);
+        test(commandOption)
+            .then(NpmciEnv.configStore);
         break;
     case "trigger":
         trigger();

ts/npmci.build.docker.ts

@@ -86,16 +86,16 @@ export let buildDockerfiles = (sortedArrayArg:Dockerfile[]) => {
 export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){
     let done = plugins.q.defer();
     sortedArrayArg.forEach(function(dockerfileArg){
-        dockerfileArg.push();
+        dockerfileArg.push(NpmciEnv.buildStage);
     });
     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.buildTag = this.cleanTag;
-        this.releaseTag = dockerTag(this.repo,this.version,"release");
+        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,34 @@ 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(stageArg){
         let done = plugins.q.defer();
-        if(this.buildTag){
+        let pushTag;
-            bashBare("docker push " + this.buildTag);
+        switch (stageArg){
-        } else {
+            case "release":
-            plugins.beautylog.error("Dockerfile hasn't been built yet!");
+                pushTag = this.releaseTag;
+                break;
+            case "test":
+            default:
+                pushTag = this.testTag;
+                break;
         }
+        bashBare("docker tag " + this.buildTag + " " + pushTag);
+        bashBare("docker push " + pushTag);
         done.resolve();
         return done.promise;
     }
-    pull(){
+    pull(registryArg:string){
-        bashBare("docker pull " + this.buildTag);
+        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 +191,10 @@ export class Dockerfile {
             plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!");
         }
     };
-    release(){
-        bashBare("docker tag " + this.getId() + " " + 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 +215,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;
+    let registry = registryArg;
-    if(stageArg == "build"  || stageArg == "test"){
-        registry = "registry.gitlab.com";
-    } 
     let repo = repoArg;
     let version = versionArg;
-    if(NpmciEnv.buildStage == "build" || NpmciEnv.buildStage == "test"){
+    if(suffixArg){
-        version = version + "_test";
+        version = versionArg + "_" + suffixArg;
-    }
+    };
     tagString = registry + "/" + repo + ":" + version;
     return tagString;
 };

ts/npmci.env.ts

@@ -13,9 +13,12 @@ export let dockerRegistry; // will be set by npmci.prepare
 export let dockerFilesBuilt:Dockerfile[] = [];
 export let dockerFiles:Dockerfile[] = [];
 
-export let config;
-
 export let configStore = () => {
+    let config = {
+        dockerRegistry: dockerRegistry,
+        dockerFilesBuilt: dockerFilesBuilt,
+        dockerFiles: dockerFiles
+    }
     plugins.smartfile.memory.toFsSync(
         JSON.stringify(config),
         {
@@ -26,13 +29,14 @@ export let configStore = () => {
 }
 
 export let configLoad = () => {
+    let config;
     try {
         config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig,"json");
     }
     catch(err){
         config = {};
         configStore();
-        plugins.beautylog.log("config inititialized!");
+        plugins.beautylog.log("config initialized!");
     }
     
     config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void(0);