2.1.29

.gitlab-ci.yml

@@ -1,9 +1,13 @@
-image: hosttoday/ht-docker-node:latest
+image: hosttoday/ht-docker-node:lts
 
 stages:
 - test
 - release
-- release2
+- trigger
+
+
+before_script:
+  - npm install -g npmci
 
 testLTS:
   stage: test
@@ -12,10 +16,6 @@ testLTS:
   tags:
     - docker
    
-before_script:
-  - npm uninstall -g npmci
-  - npm install -g npmci
-   
 testSTABLE:
   stage: test
   script:
@@ -40,8 +40,8 @@ release:
   tags:
     - docker
 
-release2:
+trigger:
-  stage: release2
+  stage: trigger
   script:
     - npmci trigger
   only:

README.md

@@ -1,5 +1,5 @@
 # NPMCI
-npmci is your friend when it comes to handling npm packages during CI builds.
+npmci is your friend when it comes to handling npm packages during CI builds. It is optimized for GitLab CI
 
 ## Status
 [![build status](https://gitlab.com/pushrocks/npmci/badges/master/build.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
@@ -14,18 +14,37 @@ Docker Hub:
 has LTS node version preinstalled. Change it with npmci
 * [hosttoday/ht-docker-node-python-3](https://hub.docker.com/r/hosttoday/ht-docker-node-python3/)  
 like ht-docker-node, but with python3 instead of python2.7
+* [hosttoday/ht-docker-dbase](https://hub.docker.com/r/hosttoday/ht-docker-dbase/)  
+based on docker:git, can be used to build docker images in conjuction with docker:dind
 
 npmci can be called from commandline:
 ```shell
 # Install any node version:
 npmci install lts # will install latest LTS node version and update PATH for node and npm versions
-npmci install stable # will install latest stable node version and update PAth for node and npm
+npmci install stable # will install latest stable node version and update PATH for node and npm
+npmci install legacy # will install latest legacy node version and update PATH for node and npm
 npmci install x.x.x #  will install any specific node version.
 
 # Install any node version, install dependencies and run test in cwd:
 npmci test lts # will install latest lts node version and run "npm install" and "npm test".
+npmci test stable # will install latest stable node version and run "npm install" and "npm test".
+npmci test legacy # will install latest legacy node version and run "npm install" and "npm test".
+npmci test x.x.x # will install any specific node version and run "npm install" and "npm test".
+npmci test docker # will test any build image with tests defined in ./npmci/dockertest_1.sh to ./npmci/dockertest_100.sh
+
+# prepare tools
+npmci prepare npm # will look for $NPMCI_TOKEN_NPM env var and create .npmrc, so npm is authenticated
+npmci prepare docker # will look for $NPMCI_LOGIN_DOCKER in form username|password and authenticate docker
+npmci prepare docker-gitlab # will authenticate docker for gitlab container registry
+
+# build containers
+npmci build docker # will build container and tag it
 
 # publish npm module
-npmci publish # will look vor $NPMCITOKEN env var and push any module in cwd to npm   
+npmci publish npm # will look vor $NPMCI_TOKEN_NPM env var and push any module in cwd to npm
+npmci publish docker
+
+# trigger webhooks
+npmci trigger # will look for NPMCI_TRIGGER_1 to NPMCI_TRIGGER_100 in form domain|id|token|ref|name  
 ```
 

dist/index.js

@@ -4,10 +4,11 @@ require("typings-global");
 var plugins = require("./npmci.plugins");
 var packJson = require("../package.json");
 plugins.beautylog.info("npmci version: " + packJson.version);
+var npmci_build_1 = require("./npmci.build");
 var npmci_install_1 = require("./npmci.install");
-var npmci_test_1 = require("./npmci.test");
 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 command;
 var commandOption;
@@ -23,6 +24,9 @@ if (typeof command === 'undefined') {
     process.exit(1);
 }
 switch (command) {
+    case "build":
+        npmci_build_1.build(commandOption);
+        break;
     case "install":
         npmci_install_1.install(commandOption);
         break;
@@ -42,4 +46,4 @@ switch (command) {
         break;
 }
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFM0MsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFFMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4Qyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUN4Qyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUd4QyxJQUFJLE9BQU8sQ0FBQztBQUNaLElBQUksYUFBYSxDQUFDO0FBRWxCLE9BQU8sQ0FBQyxTQUFTO0tBQ1osU0FBUyxDQUFDLGlDQUFpQyxDQUFDO0tBQzVDLE1BQU0sQ0FBQyxVQUFVLFVBQVUsRUFBRSxnQkFBZ0I7SUFDMUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUNyQixhQUFhLEdBQUcsZ0JBQWdCLENBQUM7QUFDckMsQ0FBQyxDQUFDLENBQUM7QUFFUCxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEMsRUFBRSxDQUFDLENBQUMsT0FBTyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwQixDQUFDO0FBRUQsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUEsQ0FBQztJQUNiLEtBQUssU0FBUztRQUNWLHVCQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDdkIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxTQUFTO1FBQ1YsdUJBQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN2QixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3ZCLEtBQUssQ0FBQztJQUNWLEtBQUssTUFBTTtRQUNQLGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxTQUFTO1FBQ1YsdUJBQU8sRUFBRSxDQUFDO1FBQ1YsS0FBSyxDQUFDO0lBQ1Y7UUFDSSxLQUFLLENBQUM7QUFDZCxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiIyEvdXNyL2Jpbi9lbnYgbm9kZVxyXG5pbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuXHJcbmxldCBwYWNrSnNvbiA9IHJlcXVpcmUoXCIuLi9wYWNrYWdlLmpzb25cIik7XHJcblxyXG5wbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwibnBtY2kgdmVyc2lvbjogXCIgKyBwYWNrSnNvbi52ZXJzaW9uKTtcclxuXHJcbmltcG9ydCB7aW5zdGFsbH0gZnJvbSBcIi4vbnBtY2kuaW5zdGFsbFwiO1xyXG5pbXBvcnQge3Rlc3R9IGZyb20gXCIuL25wbWNpLnRlc3RcIjtcclxuaW1wb3J0IHtwdWJsaXNofSBmcm9tIFwiLi9ucG1jaS5wdWJsaXNoXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge3RyaWdnZXJ9IGZyb20gXCIuL25wbWNpLnRyaWdnZXJcIjtcclxuXHJcblxyXG5sZXQgY29tbWFuZDtcclxubGV0IGNvbW1hbmRPcHRpb247XHJcblxyXG5wbHVnaW5zLmNvbW1hbmRlclxyXG4gICAgLmFyZ3VtZW50cygnPGNvbW1hbmRhcmc+IFtjb21tYW5kb3B0aW9uYXJnXScpXHJcbiAgICAuYWN0aW9uKGZ1bmN0aW9uIChjb21tYW5kYXJnLCBjb21tYW5kb3B0aW9uYXJnKSB7XHJcbiAgICAgICAgY29tbWFuZCA9IGNvbW1hbmRhcmc7XHJcbiAgICAgICAgY29tbWFuZE9wdGlvbiA9IGNvbW1hbmRvcHRpb25hcmc7XHJcbiAgICB9KTtcclxuIFxyXG5wbHVnaW5zLmNvbW1hbmRlci5wYXJzZShwcm9jZXNzLmFyZ3YpO1xyXG4gXHJcbmlmICh0eXBlb2YgY29tbWFuZCA9PT0gJ3VuZGVmaW5lZCcpIHtcclxuICAgIGNvbnNvbGUuZXJyb3IoJ25vIGNvbW1hbmQgZ2l2ZW4hJyk7XHJcbiAgICBwcm9jZXNzLmV4aXQoMSk7XHJcbn1cclxuXHJcbnN3aXRjaCAoY29tbWFuZCl7XHJcbiAgICBjYXNlIFwiaW5zdGFsbFwiOlxyXG4gICAgICAgIGluc3RhbGwoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHJlcGFyZVwiOlxyXG4gICAgICAgIHByZXBhcmUoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHVibGlzaFwiOlxyXG4gICAgICAgIHB1Ymxpc2goY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidGVzdFwiOlxyXG4gICAgICAgIHRlc3QoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidHJpZ2dlclwiOlxyXG4gICAgICAgIHRyaWdnZXIoKTtcclxuICAgICAgICBicmVhaztcclxuICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgYnJlYWs7XHJcbn1cclxuXHJcbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFM0MsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUM7QUFFMUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsaUJBQWlCLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0FBRTdELDRCQUFvQixlQUNwQixDQUFDLENBRGtDO0FBQ25DLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBRXhDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUd4QyxJQUFJLE9BQU8sQ0FBQztBQUNaLElBQUksYUFBYSxDQUFDO0FBRWxCLE9BQU8sQ0FBQyxTQUFTO0tBQ1osU0FBUyxDQUFDLGlDQUFpQyxDQUFDO0tBQzVDLE1BQU0sQ0FBQyxVQUFVLFVBQVUsRUFBRSxnQkFBZ0I7SUFDMUMsT0FBTyxHQUFHLFVBQVUsQ0FBQztJQUNyQixhQUFhLEdBQUcsZ0JBQWdCLENBQUM7QUFDckMsQ0FBQyxDQUFDLENBQUM7QUFFUCxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7QUFFdEMsRUFBRSxDQUFDLENBQUMsT0FBTyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztJQUNqQyxPQUFPLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDLENBQUM7SUFDbkMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNwQixDQUFDO0FBRUQsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUEsQ0FBQztJQUNiLEtBQUssT0FBTztRQUNSLG1CQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDckIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxTQUFTO1FBQ1YsdUJBQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUN2QixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3ZCLEtBQUssQ0FBQztJQUNWLEtBQUssU0FBUztRQUNWLHVCQUFPLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDdkIsS0FBSyxDQUFDO0lBQ1YsS0FBSyxNQUFNO1FBQ1AsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixLQUFLLENBQUM7SUFDVixLQUFLLFNBQVM7UUFDVix1QkFBTyxFQUFFLENBQUM7UUFDVixLQUFLLENBQUM7SUFDVjtRQUNJLEtBQUssQ0FBQztBQUNkLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyIjIS91c3IvYmluL2VudiBub2RlXHJcbmltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xyXG5cclxubGV0IHBhY2tKc29uID0gcmVxdWlyZShcIi4uL3BhY2thZ2UuanNvblwiKTtcclxuXHJcbnBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJucG1jaSB2ZXJzaW9uOiBcIiArIHBhY2tKc29uLnZlcnNpb24pO1xyXG5cclxuaW1wb3J0IHtidWlsZH0gZnJvbSBcIi4vbnBtY2kuYnVpbGRcIlxyXG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcclxuaW1wb3J0IHtwdWJsaXNofSBmcm9tIFwiLi9ucG1jaS5wdWJsaXNoXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge3RhZywgcmV0YWd9IGZyb20gXCIuL25wbWNpLnRhZ1wiO1xyXG5pbXBvcnQge3Rlc3R9IGZyb20gXCIuL25wbWNpLnRlc3RcIjtcclxuaW1wb3J0IHt0cmlnZ2VyfSBmcm9tIFwiLi9ucG1jaS50cmlnZ2VyXCI7XHJcblxyXG5cclxubGV0IGNvbW1hbmQ7XHJcbmxldCBjb21tYW5kT3B0aW9uO1xyXG5cclxucGx1Z2lucy5jb21tYW5kZXJcclxuICAgIC5hcmd1bWVudHMoJzxjb21tYW5kYXJnPiBbY29tbWFuZG9wdGlvbmFyZ10nKVxyXG4gICAgLmFjdGlvbihmdW5jdGlvbiAoY29tbWFuZGFyZywgY29tbWFuZG9wdGlvbmFyZykge1xyXG4gICAgICAgIGNvbW1hbmQgPSBjb21tYW5kYXJnO1xyXG4gICAgICAgIGNvbW1hbmRPcHRpb24gPSBjb21tYW5kb3B0aW9uYXJnO1xyXG4gICAgfSk7XHJcbiBcclxucGx1Z2lucy5jb21tYW5kZXIucGFyc2UocHJvY2Vzcy5hcmd2KTtcclxuIFxyXG5pZiAodHlwZW9mIGNvbW1hbmQgPT09ICd1bmRlZmluZWQnKSB7XHJcbiAgICBjb25zb2xlLmVycm9yKCdubyBjb21tYW5kIGdpdmVuIScpO1xyXG4gICAgcHJvY2Vzcy5leGl0KDEpO1xyXG59XHJcblxyXG5zd2l0Y2ggKGNvbW1hbmQpe1xyXG4gICAgY2FzZSBcImJ1aWxkXCI6XHJcbiAgICAgICAgYnVpbGQoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwiaW5zdGFsbFwiOlxyXG4gICAgICAgIGluc3RhbGwoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHJlcGFyZVwiOlxyXG4gICAgICAgIHByZXBhcmUoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwicHVibGlzaFwiOlxyXG4gICAgICAgIHB1Ymxpc2goY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidGVzdFwiOlxyXG4gICAgICAgIHRlc3QoY29tbWFuZE9wdGlvbik7XHJcbiAgICAgICAgYnJlYWs7XHJcbiAgICBjYXNlIFwidHJpZ2dlclwiOlxyXG4gICAgICAgIHRyaWdnZXIoKTtcclxuICAgICAgICBicmVhaztcclxuICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgYnJlYWs7XHJcbn1cclxuXHJcbiJdfQ==

dist/npmci.bash.d.ts

@@ -1,2 +1,3 @@
 import "typings-global";
-export declare let bash: (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

@@ -0,0 +1,32 @@
+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;
+export declare let pushDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
+export declare class Dockerfile {
+    filePath: string;
+    repo: string;
+    version: string;
+    cleanTag: string;
+    buildTag: string;
+    content: string;
+    patchedContent: string;
+    baseImage: string;
+    localBaseImageDependent: boolean;
+    localBaseDockerfile: Dockerfile;
+    constructor(options: {
+        filePath?: string;
+        fileContents?: string | Buffer;
+        read?: boolean;
+    });
+    build(): any;
+    push(): any;
+    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) => string;
+export declare let cleanTagsArrayFunction: (dockerfileArrayArg: Dockerfile[], trackingArrayArg: Dockerfile[]) => string[];

dist/npmci.build.js

@@ -1,9 +1,14 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmci.plugins");
+var buildDocker = require("./npmci.build.docker");
 exports.build = function (commandArg) {
-    var done = plugins.q.defer();
+    switch (commandArg) {
-    return done.promise;
+        case "docker":
+            return buildDocker.build();
+        default:
+            plugins.beautylog.log("build target " + commandArg + " not recognised!");
+    }
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsSUFBWSxPQUFPLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUdoQyxhQUFLLEdBQUcsVUFBUyxVQUFVO0lBQ2xDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIiwiZmlsZSI6Im5wbWNpLmJ1aWxkLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xyXG5cclxuZXhwb3J0IGxldCBidWlsZCA9IGZ1bmN0aW9uKGNvbW1hbmRBcmcpe1xyXG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcclxuICAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn0iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmJ1aWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsSUFBWSxPQUFPLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUczQyxJQUFZLFdBQVcsV0FBTSxzQkFFN0IsQ0FBQyxDQUZrRDtBQUV4QyxhQUFLLEdBQUcsVUFBUyxVQUFVO0lBQ2xDLE1BQU0sQ0FBQSxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDZixLQUFLLFFBQVE7WUFDVCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQy9CO1lBQ0ksT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsZUFBZSxHQUFHLFVBQVUsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ2pGLENBQUM7QUFDTCxDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kuYnVpbGQuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XHJcbmltcG9ydCAqIGFzIGVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcclxuaW1wb3J0ICogYXMgYnVpbGREb2NrZXIgZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcclxuXHJcbmV4cG9ydCBsZXQgYnVpbGQgPSBmdW5jdGlvbihjb21tYW5kQXJnKXtcclxuICAgIHN3aXRjaChjb21tYW5kQXJnKXtcclxuICAgICAgICBjYXNlIFwiZG9ja2VyXCI6XHJcbiAgICAgICAgICAgIHJldHVybiBidWlsZERvY2tlci5idWlsZCgpOyAgIFxyXG4gICAgICAgIGRlZmF1bHQ6XHJcbiAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcImJ1aWxkIHRhcmdldCBcIiArIGNvbW1hbmRBcmcgKyBcIiBub3QgcmVjb2duaXNlZCFcIik7XHJcbiAgICB9XHJcbn1cclxuXHJcblxyXG5cclxuIl19

dist/npmci.env.d.ts

@@ -1 +1,8 @@
-export declare let env: () => void;
+import "typings-global";
+import { GitRepo } from "smartstring";
+import { Dockerfile } from "./npmci.build.docker";
+export declare let repo: GitRepo;
+export declare let buildStage: string;
+export declare let dockerRegistry: any;
+export declare let dockerFilesBuilt: Dockerfile[];
+export declare let dockerFiles: Dockerfile[];

dist/npmci.env.js

@@ -1,5 +1,9 @@
 "use strict";
-exports.env = function () {
+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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQVcsV0FBRyxHQUFHO0FBRWpCLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgbGV0IGVudiA9IGZ1bmN0aW9uKCl7XHJcbiAgICBcclxufTsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQVcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFFdEQsa0JBQVUsR0FBVSxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQztBQUcvQyx3QkFBZ0IsR0FBZ0IsRUFBRSxDQUFDO0FBQ25DLG1CQUFXLEdBQWdCLEVBQUUsQ0FBQyIsImZpbGUiOiJucG1jaS5lbnYuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcclxuaW1wb3J0IHtEb2NrZXJmaWxlfSBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCByZXBvOkdpdFJlcG8gPSBuZXcgR2l0UmVwbyhwcm9jZXNzLmVudi5DSV9CVUlMRF9SRVBPKTtcclxuXHJcbmV4cG9ydCBsZXQgYnVpbGRTdGFnZTpzdHJpbmcgPSBwcm9jZXNzLmVudi5DSV9CVUlMRF9TVEFHRTtcclxuXHJcbmV4cG9ydCBsZXQgZG9ja2VyUmVnaXN0cnk7IC8vIHdpbGwgYmUgc2V0IGJ5IG5wbWNpLnByZXBhcmVcclxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xyXG5cclxuIl19

dist/npmci.plugins.d.ts

@@ -1,8 +1,13 @@
 import "typings-global";
 export import beautylog = require("beautylog");
 export declare let commander: any;
+export declare let gulp: any;
+export declare let gulpFunction: any;
+export import path = require("path");
 export declare let q: any;
 export declare let request: any;
 export declare let shelljs: any;
-export declare let smartssh: any;
+export import smartssh = require("smartssh");
+export import smartstring = require("smartstring");
 export import smartfile = require("smartfile");
+export declare let through2: any;

dist/npmci.plugins.js

@@ -2,10 +2,15 @@
 require("typings-global");
 exports.beautylog = require("beautylog");
 exports.commander = require("commander");
+exports.gulp = require("gulp");
+exports.gulpFunction = require("gulp-function");
+exports.path = require("path");
 exports.q = require("q");
 exports.request = require("request");
 exports.shelljs = require("shelljs");
 exports.smartssh = require("smartssh");
+exports.smartstring = require("smartstring");
 exports.smartfile = require("smartfile");
+exports.through2 = require("through2");
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDN0IsZ0JBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7QUFDNUIsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuZXhwb3J0IGltcG9ydCBiZWF1dHlsb2cgPSByZXF1aXJlKFwiYmVhdXR5bG9nXCIpO1xyXG5leHBvcnQgbGV0IGNvbW1hbmRlciA9IHJlcXVpcmUoXCJjb21tYW5kZXJcIik7XHJcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xyXG5leHBvcnQgbGV0IHJlcXVlc3QgPSByZXF1aXJlKFwicmVxdWVzdFwiKTtcclxuZXhwb3J0IGxldCBzaGVsbGpzID0gcmVxdWlyZShcInNoZWxsanNcIik7XHJcbmV4cG9ydCBsZXQgc21hcnRzc2ggPSByZXF1aXJlKFwic21hcnRzc2hcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRmaWxlID0gcmVxdWlyZShcInNtYXJ0ZmlsZVwiKTsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUNyQyxZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDMUIsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsZ0JBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcclxuZXhwb3J0IGxldCBjb21tYW5kZXIgPSByZXF1aXJlKFwiY29tbWFuZGVyXCIpO1xyXG5leHBvcnQgbGV0IGd1bHAgPSByZXF1aXJlKFwiZ3VscFwiKTtcclxuZXhwb3J0IGxldCBndWxwRnVuY3Rpb24gPSByZXF1aXJlKFwiZ3VscC1mdW5jdGlvblwiKTtcclxuZXhwb3J0IGltcG9ydCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XHJcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xyXG5leHBvcnQgbGV0IHJlcXVlc3QgPSByZXF1aXJlKFwicmVxdWVzdFwiKTtcclxuZXhwb3J0IGxldCBzaGVsbGpzID0gcmVxdWlyZShcInNoZWxsanNcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRzc2ggPSByZXF1aXJlKFwic21hcnRzc2hcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRzdHJpbmcgPSByZXF1aXJlKFwic21hcnRzdHJpbmdcIik7XHJcbmV4cG9ydCBpbXBvcnQgc21hcnRmaWxlID0gcmVxdWlyZShcInNtYXJ0ZmlsZVwiKTtcclxuZXhwb3J0IGxldCB0aHJvdWdoMiA9IHJlcXVpcmUoXCJ0aHJvdWdoMlwiKTsiXX0=

dist/npmci.publish.js

@@ -3,23 +3,15 @@ require("typings-global");
 var plugins = require("./npmci.plugins");
 var npmci_prepare_1 = require("./npmci.prepare");
 var npmci_bash_1 = require("./npmci.bash");
+var NpmciBuildDocker = require("./npmci.build.docker");
 exports.publish = function (serviceArg) {
     if (serviceArg === void 0) { serviceArg = "npm"; }
-    var done = plugins.q.defer();
     switch (serviceArg) {
         case "npm":
-            publishNpm()
+            return publishNpm();
-                .then(function () {
-                done.resolve();
-            });
-            break;
         case "docker":
-            publishDocker()
+            return publishDocker();
-                .then(function () {
-                done.resolve();
-            });
     }
-    return done.promise;
 };
 var publishNpm = function () {
     var done = plugins.q.defer();
@@ -33,12 +25,9 @@ var publishNpm = function () {
 };
 var publishDocker = function () {
     var done = plugins.q.defer();
-    npmci_prepare_1.prepare("docker")
+    NpmciBuildDocker.readDockerfiles();
-        .then(function () {
+    done.resolve();
-        npmci_bash_1.bash("docker push");
-        done.resolve();
-    });
     return done.promise;
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUV2QixlQUFPLEdBQUcsVUFBQyxVQUF5QjtJQUF6QiwwQkFBeUIsR0FBekIsa0JBQXlCO0lBQzNDLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUNoQixLQUFLLEtBQUs7WUFDTixVQUFVLEVBQUU7aUJBQ1AsSUFBSSxDQUFDO2dCQUNGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUNuQixDQUFDLENBQUMsQ0FBQztZQUNQLEtBQUssQ0FBQztRQUNWLEtBQUssUUFBUTtZQUNULGFBQWEsRUFBRTtpQkFDVixJQUFJLENBQUM7Z0JBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ2YsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGLElBQUksVUFBVSxHQUFJO0lBQ2QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3Qix1QkFBTyxDQUFDLEtBQUssQ0FBQztTQUNULElBQUksQ0FBQztRQUNGLGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUU7UUFDL0IsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1IsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDdkIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxhQUFhLEdBQUc7SUFDaEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3Qix1QkFBTyxDQUFDLFFBQVEsQ0FBQztTQUNaLElBQUksQ0FBQztRQUNGLGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6Im5wbWNpLnB1Ymxpc2guanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtwcmVwYXJlfSBmcm9tIFwiLi9ucG1jaS5wcmVwYXJlXCI7XHJcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xyXG5cclxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xyXG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcclxuICAgIHN3aXRjaCAoc2VydmljZUFyZyl7XHJcbiAgICAgICAgY2FzZSBcIm5wbVwiOiBcclxuICAgICAgICAgICAgcHVibGlzaE5wbSgpXHJcbiAgICAgICAgICAgICAgICAudGhlbihmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgICAgICAgICAgICAgfSk7XHJcbiAgICAgICAgICAgIGJyZWFrO1xyXG4gICAgICAgIGNhc2UgXCJkb2NrZXJcIjpcclxuICAgICAgICAgICAgcHVibGlzaERvY2tlcigpXHJcbiAgICAgICAgICAgICAgICAudGhlbihmdW5jdGlvbigpe1xyXG4gICAgICAgICAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgICAgICAgICAgICAgfSk7XHJcbiAgICB9XHJcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59O1xyXG5cclxubGV0IHB1Ymxpc2hOcG0gID0gZnVuY3Rpb24oKXtcclxuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XHJcbiAgICBwcmVwYXJlKFwibnBtXCIpXHJcbiAgICAgICAgLnRoZW4oZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgYmFzaChcIm5wbSBwdWJsaXNoXCIpO1xyXG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5vayhcIkRvbmUhXCIpIDtcclxuICAgICAgICAgICAgZG9uZS5yZXNvbHZlKCk7XHJcbiAgICAgICAgfSk7XHJcbiAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn1cclxuXHJcbmxldCBwdWJsaXNoRG9ja2VyID0gZnVuY3Rpb24oKXtcclxuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XHJcbiAgICBwcmVwYXJlKFwiZG9ja2VyXCIpXHJcbiAgICAgICAgLnRoZW4oZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgYmFzaChcImRvY2tlciBwdXNoXCIpO1xyXG4gICAgICAgICAgICBkb25lLnJlc29sdmUoKTtcclxuICAgICAgICB9KTtcclxuICAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn07Il19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUVsQyxJQUFZLGdCQUFnQixXQUFNLHNCQUVsQyxDQUFDLENBRnVEO0FBRTdDLGVBQU8sR0FBRyxVQUFDLFVBQXlCO0lBQXpCLDBCQUF5QixHQUF6QixrQkFBeUI7SUFDM0MsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUNoQixLQUFLLEtBQUs7WUFDTixNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDeEIsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQy9CLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRixJQUFJLFVBQVUsR0FBSTtJQUNkLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsdUJBQU8sQ0FBQyxLQUFLLENBQUM7U0FDVCxJQUFJLENBQUM7UUFDRixpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFFO1FBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNuQixDQUFDLENBQUMsQ0FBQztJQUNSLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3ZCLENBQUMsQ0FBQTtBQUVELElBQUksYUFBYSxHQUFHO0lBQ2hCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDekIsZ0JBQWdCLENBQUMsZUFBZSxFQUFFLENBQUE7SUFHdEMsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6Im5wbWNpLnB1Ymxpc2guanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtwcmVwYXJlfSBmcm9tIFwiLi9ucG1jaS5wcmVwYXJlXCI7XHJcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xyXG5pbXBvcnQgKiBhcyBOcG1jaUVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcclxuaW1wb3J0ICogYXMgTnBtY2lCdWlsZERvY2tlciBmcm9tIFwiLi9ucG1jaS5idWlsZC5kb2NrZXJcIlxyXG5cclxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xyXG4gICAgc3dpdGNoIChzZXJ2aWNlQXJnKXtcclxuICAgICAgICBjYXNlIFwibnBtXCI6IFxyXG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaE5wbSgpO1xyXG4gICAgICAgIGNhc2UgXCJkb2NrZXJcIjpcclxuICAgICAgICAgICAgcmV0dXJuIHB1Ymxpc2hEb2NrZXIoKTtcclxuICAgIH1cclxufTtcclxuXHJcbmxldCBwdWJsaXNoTnBtICA9IGZ1bmN0aW9uKCl7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgcHJlcGFyZShcIm5wbVwiKVxyXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgIGJhc2goXCJucG0gcHVibGlzaFwiKTtcclxuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cub2soXCJEb25lIVwiKSA7XHJcbiAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgICAgIH0pO1xyXG4gICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59XHJcblxyXG5sZXQgcHVibGlzaERvY2tlciA9IGZ1bmN0aW9uKCl7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgICAgIE5wbWNpQnVpbGREb2NrZXIucmVhZERvY2tlcmZpbGVzKClcclxuICAgICAgICAgICAgXHJcbiAgICAgICAgXHJcbiAgICBkb25lLnJlc29sdmUoKTtcclxuICAgIHJldHVybiBkb25lLnByb21pc2U7XHJcbn07Il19

dist/npmci.tag.d.ts

@@ -0,0 +1,3 @@
+import "typings-global";
+export declare let tag: (commandOptionArg: any) => void;
+export declare let retag: () => void;

dist/npmci.tag.js

@@ -0,0 +1,8 @@
+"use strict";
+require("typings-global");
+exports.tag = function (commandOptionArg) {
+};
+exports.retag = function () {
+};
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRhZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBTWIsV0FBRyxHQUFHLFVBQVMsZ0JBQWdCO0FBRTFDLENBQUMsQ0FBQTtBQUVVLGFBQUssR0FBRztBQUVuQixDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kudGFnLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xyXG5pbXBvcnQge2Jhc2h9IGZyb20gXCIuL25wbWNpLmJhc2hcIjtcclxuaW1wb3J0ICogYXMgZW52IGZyb20gXCIuL25wbWNpLmVudlwiO1xyXG5cclxuZXhwb3J0IGxldCB0YWcgPSBmdW5jdGlvbihjb21tYW5kT3B0aW9uQXJnKXtcclxuICAgIFxyXG59XHJcblxyXG5leHBvcnQgbGV0IHJldGFnID0gZnVuY3Rpb24oKXtcclxuICAgIFxyXG59O1xyXG4iXX0=

dist/npmci.test.js

@@ -5,16 +5,35 @@ var npmci_bash_1 = require("./npmci.bash");
 var npmci_install_1 = require("./npmci.install");
 exports.test = function (versionArg) {
     var done = plugins.q.defer();
-    npmci_install_1.install(versionArg)
+    if (versionArg == "docker") {
-        .then(function () {
+        testDocker()
-        plugins.beautylog.info("now installing dependencies:");
+            .then(function () {
-        npmci_bash_1.bash("npm install");
+            done.resolve();
-        plugins.beautylog.info("now starting tests:");
+        });
-        npmci_bash_1.bash("npm test");
+    }
-        plugins.beautylog.success("test finished");
+    else {
-        done.resolve();
+        npmci_install_1.install(versionArg)
-    });
+            .then(npmDependencies)
+            .then(function () {
+            plugins.beautylog.info("now starting tests:");
+            npmci_bash_1.bash("npm test");
+            plugins.beautylog.success("test finished");
+            done.resolve();
+        });
+    }
+    return done.promise;
+};
+var npmDependencies = function () {
+    var done = plugins.q.defer();
+    plugins.beautylog.info("now installing dependencies:");
+    npmci_bash_1.bash("npm install");
+    done.resolve();
+    return done.promise;
+};
+var testDocker = function () {
+    var done = plugins.q.defer();
+    done.resolve();
     return done.promise;
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUU3QixZQUFJLEdBQUcsVUFBQyxVQUFVO0lBQ3pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsdUJBQU8sQ0FBQyxVQUFVLENBQUM7U0FDZCxJQUFJLENBQUM7UUFDRixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO1FBQ3ZELGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDcEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUM5QyxpQkFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2pCLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNuQixDQUFDLENBQUMsQ0FBQTtJQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS50ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xyXG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcclxuXHJcbmV4cG9ydCBsZXQgdGVzdCA9ICh2ZXJzaW9uQXJnKSA9PiB7XHJcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xyXG4gICAgaW5zdGFsbCh2ZXJzaW9uQXJnKVxyXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJub3cgaW5zdGFsbGluZyBkZXBlbmRlbmNpZXM6XCIpO1xyXG4gICAgICAgICAgICBiYXNoKFwibnBtIGluc3RhbGxcIik7XHJcbiAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJub3cgc3RhcnRpbmcgdGVzdHM6XCIpO1xyXG4gICAgICAgICAgICBiYXNoKFwibnBtIHRlc3RcIik7XHJcbiAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLnN1Y2Nlc3MoXCJ0ZXN0IGZpbmlzaGVkXCIpO1xyXG4gICAgICAgICAgICBkb25lLnJlc29sdmUoKTtcclxuICAgICAgICB9KVxyXG4gICAgcmV0dXJuIGRvbmUucHJvbWlzZTtcclxufSJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUc3QixZQUFJLEdBQUcsVUFBQyxVQUFVO0lBQ3pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsRUFBRSxDQUFBLENBQUMsVUFBVSxJQUFJLFFBQVEsQ0FBQyxDQUFBLENBQUM7UUFDdkIsVUFBVSxFQUFFO2FBQ1AsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osdUJBQU8sQ0FBQyxVQUFVLENBQUM7YUFDZCxJQUFJLENBQUMsZUFBZSxDQUFDO2FBQ3JCLElBQUksQ0FBQztZQUNGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7WUFDOUMsaUJBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNqQixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUMzQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDWCxDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUc7SUFDbEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO0lBQ3ZELGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDcEIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBRTdCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS50ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XHJcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xyXG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcclxuaW1wb3J0ICogYXMgZW52IGZyb20gXCIuL25wbWNpLmVudlwiO1xyXG5cclxuZXhwb3J0IGxldCB0ZXN0ID0gKHZlcnNpb25BcmcpID0+IHtcclxuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XHJcbiAgICBpZih2ZXJzaW9uQXJnID09IFwiZG9ja2VyXCIpe1xyXG4gICAgICAgIHRlc3REb2NrZXIoKVxyXG4gICAgICAgICAgICAudGhlbigoKT0+e1xyXG4gICAgICAgICAgICAgICAgZG9uZS5yZXNvbHZlKCk7XHJcbiAgICAgICAgICAgIH0pO1xyXG4gICAgfSBlbHNlIHtcclxuICAgICAgICBpbnN0YWxsKHZlcnNpb25BcmcpXHJcbiAgICAgICAgICAgIC50aGVuKG5wbURlcGVuZGVuY2llcylcclxuICAgICAgICAgICAgLnRoZW4oKCk9PntcclxuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJub3cgc3RhcnRpbmcgdGVzdHM6XCIpO1xyXG4gICAgICAgICAgICAgICAgYmFzaChcIm5wbSB0ZXN0XCIpO1xyXG4gICAgICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cuc3VjY2VzcyhcInRlc3QgZmluaXNoZWRcIik7XHJcbiAgICAgICAgICAgICAgICBkb25lLnJlc29sdmUoKTtcclxuICAgICAgICAgICAgfSk7XHJcbiAgICB9XHJcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59XHJcblxyXG5sZXQgbnBtRGVwZW5kZW5jaWVzID0gZnVuY3Rpb24oKXtcclxuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XHJcbiAgICBwbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwibm93IGluc3RhbGxpbmcgZGVwZW5kZW5jaWVzOlwiKTtcclxuICAgIGJhc2goXCJucG0gaW5zdGFsbFwiKTtcclxuICAgIGRvbmUucmVzb2x2ZSgpO1xyXG4gICAgcmV0dXJuIGRvbmUucHJvbWlzZTtcclxufVxyXG5cclxubGV0IHRlc3REb2NrZXIgPSBmdW5jdGlvbigpe1xyXG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcclxuICAgIFxyXG4gICAgZG9uZS5yZXNvbHZlKCk7XHJcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG59XHJcblxyXG4iXX0=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.1.1",
+  "version": "2.1.29",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -20,16 +20,22 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmci#README",
   "devDependencies": {
-    "npmts": "^5.1.18"
+    "npmts": "^5.2.1",
+    "should": "^9.0.0",
+    "typings-test": "^1.0.1"
   },
   "dependencies": {
-    "beautylog": "^5.0.6",
+    "beautylog": "^5.0.8",
     "commander": "^2.9.0",
+    "gulp": "^3.9.1",
+    "gulp-function": "^1.3.5",
     "q": "^1.4.1",
     "request": "^2.72.0",
     "shelljs": "^0.7.0",
     "smartfile": "^3.0.10",
-    "smartssh": "^1.0.4",
+    "smartssh": "^1.0.5",
+    "smartstring": "^2.0.6",
+    "through2": "^2.0.1",
     "typings-global": "^1.0.3"
   }
 }

test/assets/Dockerfile

@@ -0,0 +1,2 @@
+FROM ubuntu
+RUN apt-get update

test/assets/Dockerfile_sometag1

@@ -0,0 +1,2 @@
+FROM mygroup/myrepo:sometag2
+RUN apt-get update

test/assets/Dockerfile_sometag2

@@ -0,0 +1 @@
+FROM mygroup/myrepo:latest

test/test.d.ts

@@ -0,0 +1,2 @@
+import "typings-test";
+import "should";

test/test.ts

@@ -0,0 +1,78 @@
+import "typings-test";
+import "should";
+import path = require("path");
+import * as beautylog from "beautylog"
+//set up environment
+process.env.CI_BUILD_REPO = "https://yyyyyy:xxxxxxxx@gitlab.com/mygroup/myrepo.git";
+process.env.NPMTS_TEST = "true";
+process.cwd = () => {
+    return path.join(__dirname,"assets/");
+};
+
+//require NPMCI files
+import NpmciBuildDocker = require("../dist/npmci.build.docker");
+import NpmciPublish = require("../dist/npmci.publish");
+import NpmciTest = require("../dist/npmci.test");
+
+
+let dockerfile1:NpmciBuildDocker.Dockerfile;
+let dockerfile2:NpmciBuildDocker.Dockerfile;
+let sortableArray:NpmciBuildDocker.Dockerfile[];
+
+describe("NPMCI",function(){
+    describe("build.docker",function(){
+        it("should return valid Dockerfiles",function(){
+            dockerfile1 = new NpmciBuildDocker.Dockerfile({filePath:"./Dockerfile",read:true});
+            dockerfile2 = new NpmciBuildDocker.Dockerfile({filePath:"./Dockerfile_sometag1",read:true});
+            dockerfile1.version.should.equal("latest");
+            dockerfile2.version.should.equal("sometag1");
+        });
+        it("should read a directory of Dockerfiles",function(done){
+            NpmciBuildDocker.readDockerfiles()
+                .then(function(readDockerfilesArrayArg:NpmciBuildDocker.Dockerfile[]){
+                    readDockerfilesArrayArg[1].version.should.equal("sometag1");
+                    sortableArray = readDockerfilesArrayArg
+                    done();
+                });
+        })
+        it("should sort an array of Dockerfiles",function(done){
+            NpmciBuildDocker.sortDockerfiles(sortableArray)
+                .then(function(sortedArrayArg:NpmciBuildDocker.Dockerfile[]){
+                    beautylog.success("final result");
+                    console.log(sortedArrayArg);
+                    done();
+                })
+        });
+        it("should correctly chain Dockerfile handling",function(done){
+            NpmciBuildDocker.build()
+                .then(()=>{
+                    done();
+                });
+        })
+    });
+    describe(".publish.docker",function(){
+        it("should publish all built Dockerfiles",function(done){
+            NpmciPublish.publish("docker")
+                .then(() => {
+                    done();
+                });;
+        });
+    });
+    describe(".test.npm",function(){
+        it("should source nvm using bash and install a specific node version",function(done){
+            NpmciTest.test("legacy")
+                .then(() => {
+                    return NpmciTest.test("lts");
+                })
+                .then(() => {
+                    return NpmciTest.test("stable");
+                })
+                .then(() => {
+                     return NpmciTest.test("docker");
+                })
+                .then(() => {
+                    done();
+                });
+        })
+    });
+})

ts/index.ts

@@ -6,10 +6,12 @@ let packJson = require("../package.json");
 
 plugins.beautylog.info("npmci version: " + packJson.version);
 
+import {build} from "./npmci.build"
 import {install} from "./npmci.install";
-import {test} from "./npmci.test";
 import {publish} from "./npmci.publish";
 import {prepare} from "./npmci.prepare";
+import {tag, retag} from "./npmci.tag";
+import {test} from "./npmci.test";
 import {trigger} from "./npmci.trigger";
 
 
@@ -31,6 +33,9 @@ if (typeof command === 'undefined') {
 }
 
 switch (command){
+    case "build":
+        build(commandOption);
+        break;
     case "install":
         install(commandOption);
         break;

ts/npmci.bash.ts

@@ -1,12 +1,41 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
-export let bash = (commandArg) => {
+export let bash = (commandArg:string,retryArg = 2) => {
-    let exitCode = plugins.shelljs.exec(
+    if(!process.env.NPMTS_TEST){
-        "bash -c \"source /usr/local/nvm/nvm.sh &&" +
+        for (let i = 0; i <= retryArg; i++){
-        commandArg +
+            let exitCode:number = plugins.shelljs.exec(
-        "\""
+                "bash -c \"source /usr/local/nvm/nvm.sh &&" +
-    ).code;
+                commandArg +
-    if(exitCode !== 0){
+                "\""
-        process.exit(1);
+            ).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,retryArg = 2) => {
+    if (!process.env.NPMTS_TEST){
+        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

@@ -0,0 +1,212 @@
+import * as plugins from "./npmci.plugins"
+import * as NpmciEnv from "./npmci.env";
+import {bashBare} from "./npmci.bash";
+export let build = function(){
+    let done = plugins.q.defer();
+    readDockerfiles()
+        .then(sortDockerfiles)
+        .then(mapDockerfiles)
+        .then(buildDockerfiles)
+        .then(pushDockerfiles)
+        .then(() => {
+            done.resolve();
+        });
+    return done.promise;
+}
+
+export let readDockerfiles = function(){
+    let done = plugins.q.defer();
+    let readDockerfilesArray:Dockerfile[] = []
+    plugins.gulp.src("./Dockerfile*")
+        .pipe(plugins.through2.obj(function(file,enc,cb){
+            let myDockerfile = new Dockerfile({
+                filePath:file.path,
+                read:true
+            });
+            readDockerfilesArray.push(myDockerfile);
+            cb(null,file);
+         },function(){
+             done.resolve(readDockerfilesArray);
+         }));
+    return done.promise;
+}
+
+export let getDockerImagesGitlab = function(sortableArrayArg:Dockerfile[]){
+    
+}
+
+export let sortDockerfiles = function(sortableArrayArg:Dockerfile[]){
+    let done = plugins.q.defer();
+    let sortedArray:Dockerfile[] = []; 
+    let trackingArray:Dockerfile[] = [];
+    let sorterFunctionCounter:number = 0;
+    let sorterFunction = function(){
+        sortableArrayArg.forEach((dockerfileArg)=>{
+            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,trackingArray);
+            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && trackingArray.indexOf(dockerfileArg) == -1){
+                sortedArray.push(dockerfileArg);
+                trackingArray.push(dockerfileArg);
+            } else if(cleanTags.indexOf(dockerfileArg.baseImage) != -1){
+                dockerfileArg.localBaseImageDependent = true;
+            };
+        });
+        if(sortableArrayArg.length == sortedArray.length){
+            done.resolve(sortedArray);
+        } else if (sorterFunctionCounter < 10) {
+            sorterFunctionCounter++;
+            sorterFunction();
+        };
+    }
+    sorterFunction();
+    return done.promise;
+};
+
+export let mapDockerfiles = function(sortedArray:Dockerfile[]){
+    let done = plugins.q.defer();
+    sortedArray.forEach((dockerfileArg) => {
+        if(dockerfileArg.localBaseImageDependent){
+            sortedArray.forEach((dockfile2:Dockerfile) => {
+                if(dockfile2.cleanTag == dockerfileArg.baseImage){
+                    dockerfileArg.localBaseDockerfile = dockfile2;
+                }
+            })
+        };
+    });
+    done.resolve(sortedArray);
+    return done.promise;
+}
+
+export let buildDockerfiles = function(sortedArrayArg:Dockerfile[]){
+    let done = plugins.q.defer();
+    sortedArrayArg.forEach(function(dockerfileArg){
+        dockerfileArg.build();
+    })
+    done.resolve(sortedArrayArg);
+    return done.promise;
+}
+
+export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){
+    let done = plugins.q.defer();
+    sortedArrayArg.forEach(function(dockerfileArg){
+        dockerfileArg.push();
+    });
+    done.resolve(sortedArrayArg);
+    return done.promise;
+}
+
+export class Dockerfile {
+    filePath:string;
+    repo:string;
+    version:string;
+    cleanTag:string;
+    buildTag:string;
+    content:string;
+    patchedContent:string;
+    baseImage:string;
+    localBaseImageDependent:boolean;
+    localBaseDockerfile:Dockerfile;
+    constructor(options:{filePath?:string,fileContents?:string|Buffer,read?:boolean}){
+        this.filePath = options.filePath;
+        this.repo = NpmciEnv.repo.user + "/" + NpmciEnv.repo.repo;
+        this.version = dockerFileVersion(plugins.path.parse(options.filePath).base);
+        this.cleanTag = this.repo + ":" + this.version;
+        if(options.filePath && options.read){
+            this.content = plugins.smartfile.local.toStringSync(plugins.path.resolve(options.filePath));
+        };
+        this.baseImage = dockerBaseImage(this.content);
+        this.localBaseImageDependent = false;
+    };
+    build(){
+        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;
+    };
+}
+
+export let dockerFileVersion = function(dockerfileNameArg:string):string{
+    let versionString:string;
+    let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
+    let regexResultArray = versionRegex.exec(dockerfileNameArg);
+    if(regexResultArray && regexResultArray.length == 2){
+        versionString = regexResultArray[1];        
+    } else {
+        versionString = "latest";
+    }
+    return versionString;
+}
+
+export let dockerBaseImage = function(dockerfileContentArg:string){
+    let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n?/
+    let regexResultArray = baseImageRegex.exec(dockerfileContentArg)
+    return regexResultArray[1];
+}
+
+export let dockerTag = function(repoArg:string,versionArg:string):string{
+    let tagString:string;
+    let registry = NpmciEnv.dockerRegistry;
+    if(NpmciEnv.buildStage == "build"  || NpmciEnv.buildStage == "test"){
+        registry = "registry.gitlab.com";
+    } 
+    let repo = repoArg;
+    let version = versionArg;
+    if(NpmciEnv.buildStage == "build" || NpmciEnv.buildStage == "test"){
+        version = version + "_test";
+    }
+    tagString = registry + "/" + repo + ":" + version;
+    return tagString;
+};
+
+export let cleanTagsArrayFunction = function(dockerfileArrayArg:Dockerfile[],trackingArrayArg:Dockerfile[]):string[]{
+    let cleanTagsArray:string[] = [];
+    dockerfileArrayArg.forEach(function(dockerfileArg){
+        if(trackingArrayArg.indexOf(dockerfileArg) == -1){
+            cleanTagsArray.push(dockerfileArg.cleanTag);
+        }
+    });
+    return cleanTagsArray;
+}

ts/npmci.build.ts

@@ -1,8 +1,17 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
 import {bash} from "./npmci.bash";
+import * as env from "./npmci.env";
+import * as buildDocker from "./npmci.build.docker"
 
 export let build = function(commandArg){
-    let done = plugins.q.defer();
+    switch(commandArg){
-    return done.promise;
+        case "docker":
+            return buildDocker.build();   
+        default:
+            plugins.beautylog.log("build target " + commandArg + " not recognised!");
+    }
 }
+
+
+

ts/npmci.env.ts

@@ -1,3 +1,13 @@
-export let env = function(){
+import "typings-global";
+import * as plugins from "./npmci.plugins";
+import {GitRepo} from "smartstring";
+import {Dockerfile} from "./npmci.build.docker"
+
+export let repo:GitRepo = new GitRepo(process.env.CI_BUILD_REPO);
+
+export let buildStage:string = process.env.CI_BUILD_STAGE;
+
+export let dockerRegistry; // will be set by npmci.prepare
+export let dockerFilesBuilt:Dockerfile[] = [];
+export let dockerFiles:Dockerfile[] = [];
 
-};

ts/npmci.plugins.ts

@@ -1,8 +1,13 @@
 import "typings-global";
 export import beautylog = require("beautylog");
 export let commander = require("commander");
+export let gulp = require("gulp");
+export let gulpFunction = require("gulp-function");
+export import path = require("path");
 export let q = require("q");
 export let request = require("request");
 export let shelljs = require("shelljs");
-export let smartssh = require("smartssh");
+export import smartssh = require("smartssh");
+export import smartstring = require("smartstring");
 export import smartfile = require("smartfile");
+export let through2 = require("through2");

ts/npmci.prepare.ts

@@ -1,21 +1,7 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
 import {bash} from "./npmci.bash";
-
+import * as env from "./npmci.env"
-let docker = function(){
-    let done = plugins.q.defer();
-    let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
-    if(!process.env.NPMCI_LOGIN_DOCKER){
-        plugins.beautylog.error("You have to specify Login Data to the Docker Registry");
-        process.exit(1);
-    }
-    let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER);
-    let username = dockerRegexResultArray[1];
-    let password = dockerRegexResultArray[2];
-    plugins.shelljs.exec("docker login -u " + username + " -p " + password);
-    done.resolve();
-    return done.promise;
-}
 
 let npm = function(){
     let done = plugins.q.defer();
@@ -35,11 +21,41 @@ let npm = function(){
     return done.promise;
 };
 
+let docker = function(){
+    let done = plugins.q.defer();
+    env.dockerRegistry = "docker.io"
+    let dockerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/
+    if(!process.env.NPMCI_LOGIN_DOCKER){
+        plugins.beautylog.error("You have to specify Login Data to the Docker Registry");
+        process.exit(1);
+    }
+    let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER);
+    let username = dockerRegexResultArray[1];
+    let password = dockerRegexResultArray[2];
+    plugins.shelljs.exec("docker login -u " + username + " -p " + password);
+    done.resolve();
+    return done.promise;
+}
+
+let dockerGitlab = function(){
+    let done = plugins.q.defer();
+    env.dockerRegistry = "registry.gitlab.com";
+    let ciBuildToken = process.env.CI_BUILD_TOKEN
+    plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + ciBuildToken + " " + env.dockerRegistry);
+    done.resolve();
+    return done.promise;
+}
+
 export let prepare = function(serviceArg:string){
     switch (serviceArg) {
         case "npm":
             return npm();
         case "docker":
-            return docker();
+            return docker()
+                .then(dockerGitlab); // always also login to gitlab registry for tests 
+        case "docker-gitlab":
+            return dockerGitlab()
+        default:
+            break;
     }
 }

ts/npmci.publish.ts

@@ -2,23 +2,16 @@ import "typings-global";
 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") => {
-    let done = plugins.q.defer();
     switch (serviceArg){
         case "npm": 
-            publishNpm()
+            return publishNpm();
-                .then(function(){
-                    done.resolve();
-                });
-            break;
         case "docker":
-            publishDocker()
+            return publishDocker();
-                .then(function(){
-                    done.resolve();
-                });
     }
-    return done.promise;
 };
 
 let publishNpm  = function(){
@@ -34,10 +27,9 @@ let publishNpm  = function(){
 
 let publishDocker = function(){
     let done = plugins.q.defer();
-    prepare("docker")
+        NpmciBuildDocker.readDockerfiles()
-        .then(function(){
+            
-            bash("docker push");
+        
-            done.resolve();
+    done.resolve();
-        });
     return done.promise;
 };

ts/npmci.tag.ts

@@ -0,0 +1,13 @@
+import "typings-global";
+import * as plugins from "./npmci.plugins";
+import {prepare} from "./npmci.prepare";
+import {bash} from "./npmci.bash";
+import * as env from "./npmci.env";
+
+export let tag = function(commandOptionArg){
+    
+}
+
+export let retag = function(){
+    
+};

ts/npmci.test.ts

@@ -2,17 +2,40 @@ import "typings-global";
 import * as plugins from "./npmci.plugins";
 import {bash} from "./npmci.bash";
 import {install} from "./npmci.install";
+import * as env from "./npmci.env";
 
 export let test = (versionArg) => {
     let done = plugins.q.defer();
-    install(versionArg)
+    if(versionArg == "docker"){
-        .then(function(){
+        testDocker()
-            plugins.beautylog.info("now installing dependencies:");
+            .then(()=>{
-            bash("npm install");
+                done.resolve();
-            plugins.beautylog.info("now starting tests:");
+            });
-            bash("npm test");
+    } else {
-            plugins.beautylog.success("test finished");
+        install(versionArg)
-            done.resolve();
+            .then(npmDependencies)
-        })
+            .then(()=>{
+                plugins.beautylog.info("now starting tests:");
+                bash("npm test");
+                plugins.beautylog.success("test finished");
+                done.resolve();
+            });
+    }
     return done.promise;
 }
+
+let npmDependencies = function(){
+    let done = plugins.q.defer();
+    plugins.beautylog.info("now installing dependencies:");
+    bash("npm install");
+    done.resolve();
+    return done.promise;
+}
+
+let testDocker = function(){
+    let done = plugins.q.defer();
+    
+    done.resolve();
+    return done.promise;
+}
+