2.1.52

.gitignore

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

.gitlab-ci.yml

@@ -1,12 +1,36 @@
 image: hosttoday/ht-docker-node:lts
 
 stages:
+- test
 - release
 - trigger
 
+
 before_script:
   - npm install -g npmci
 
+testLTS:
+  stage: test
+  script:
+    - npmci test lts
+  tags:
+    - docker
+   
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+    
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+  allow_failure: true
+
 release:
   stage: release
   script:

.npmignore

@@ -1,2 +1,5 @@
 docs/
-coverage/
+coverage/
+test/
+node_modules/
+config.json

README.md

@@ -3,19 +3,16 @@ npmci is your friend when it comes to handling npm packages during CI builds. It
 
 ## Status
 [![build status](https://gitlab.com/pushrocks/npmci/badges/master/build.svg)](https://gitlab.com/pushrocks/npmci/commits/master)
-[![Build status](https://ci.appveyor.com/api/projects/status/7h4qq2qtrke5a9vj/branch/master?svg=true)](https://ci.appveyor.com/project/philkunz/npmci/branch/master)
 
 ## Usage
 npmci is designed to work in docker CI environments. The following docker images come with npmci presinstalled:
 
 Docker Hub:
 
-* [hosttoday/ht-docker-node](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
+* [hosttoday/ht-docker-node:npmci](https://hub.docker.com/r/hosttoday/ht-docker-node/)  
-has LTS node version preinstalled. Change it with npmci
+has LTS node version and npmci preinstalled.
-* [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
+based on docker:git, can be used to build docker images in conjunction with docker:dind
 
 npmci can be called from commandline:
 ```shell
@@ -31,6 +28,8 @@ npmci test stable # will install latest stable node version and run "npm install
 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
+## npmci test docker will look at all Dockerfiles and look for according tags on GitLab container registry
+
 
 # prepare tools
 npmci prepare npm # will look for $NPMCI_TOKEN_NPM env var and create .npmrc, so npm is authenticated
@@ -38,7 +37,11 @@ npmci prepare docker # will look for $NPMCI_LOGIN_DOCKER in form username|passwo
 npmci prepare docker-gitlab # will authenticate docker for gitlab container registry
 
 # build containers
-npmci build docker # will build container and tag it
+npmci build docker # will build containers
+## all Dockerfiles named DOckerfile* are picked up.
+## specify tags lake this Dockerfile_[tag]
+## uploads all built images as [username]/[reponame]:[tag]_test to GitLab
+## then test in next step with "npmci test docker"
 
 # publish npm module
 npmci publish npm # will look vor $NPMCI_TOKEN_NPM env var and push any module in cwd to npm

dist/index.d.ts

@@ -1 +1,4 @@
 import "typings-global";
+export { build } from "./npmci.build";
+export { install } from "./npmci.install";
+export { publish } from "./npmci.publish";

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, bareArg?: boolean) => string;
+export declare let bashBare: (commandArg: any, retryArg?: number) => string;

dist/npmci.bash.js

@@ -1,13 +1,44 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmci.plugins");
-exports.bash = function (commandArg) {
+exports.bash = function (commandArg, retryArg, bareArg) {
-    var exitCode = plugins.shelljs.exec("bash -c \"source /usr/local/nvm/nvm.sh &&" +
+    if (retryArg === void 0) { retryArg = 2; }
-        commandArg +
+    if (bareArg === void 0) { bareArg = false; }
-        "\"").code;
+    var exitCode;
-    if (exitCode !== 0) {
+    var stdOut;
-        process.exit(1);
+    var execResult;
+    if (!process.env.NPMTS_TEST) {
+        for (var i = 0; i <= retryArg; i++) {
+            if (!bareArg) {
+                execResult = plugins.shelljs.exec("bash -c \"source /usr/local/nvm/nvm.sh &&" +
+                    commandArg +
+                    "\"");
+            }
+            else {
+                execResult = plugins.shelljs.exec(commandArg);
+            }
+            exitCode = execResult.code;
+            stdOut = execResult.stdout;
+            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);
+    }
+    return stdOut;
+};
+exports.bashBare = function (commandArg, retryArg) {
+    if (retryArg === void 0) { retryArg = 2; }
+    return exports.bash(commandArg, retryArg, true);
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQ2hDLFlBQUksR0FBRyxVQUFDLFVBQVU7SUFDekIsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQy9CLDJDQUEyQztRQUMzQyxVQUFVO1FBQ1YsSUFBSSxDQUNQLENBQUMsSUFBSSxDQUFDO0lBQ1AsRUFBRSxDQUFBLENBQUMsUUFBUSxLQUFLLENBQUMsQ0FBQyxDQUFBLENBQUM7UUFDZixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BCLENBQUM7QUFDTCxDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcbmV4cG9ydCBsZXQgYmFzaCA9IChjb21tYW5kQXJnKSA9PiB7XG4gICAgbGV0IGV4aXRDb2RlID0gcGx1Z2lucy5zaGVsbGpzLmV4ZWMoXG4gICAgICAgIFwiYmFzaCAtYyBcXFwic291cmNlIC91c3IvbG9jYWwvbnZtL252bS5zaCAmJlwiICtcbiAgICAgICAgY29tbWFuZEFyZyArXG4gICAgICAgIFwiXFxcIlwiXG4gICAgKS5jb2RlO1xuICAgIGlmKGV4aXRDb2RlICE9PSAwKXtcbiAgICAgICAgcHJvY2Vzcy5leGl0KDEpO1xuICAgIH1cbn0iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBRWhDLFlBQUksR0FBRyxVQUFDLFVBQWlCLEVBQUMsUUFBWSxFQUFDLE9BQWU7SUFBNUIsd0JBQVksR0FBWixZQUFZO0lBQUMsdUJBQWUsR0FBZixlQUFlO0lBQzdELElBQUksUUFBZSxDQUFDO0lBQ3BCLElBQUksTUFBYSxDQUFDO0lBQ2xCLElBQUksVUFBVSxDQUFDO0lBQ2YsRUFBRSxDQUFBLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDeEIsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsSUFBSSxRQUFRLEVBQUUsQ0FBQyxFQUFFLEVBQUMsQ0FBQztZQUNoQyxFQUFFLENBQUEsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFBLENBQUM7Z0JBQ1QsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUM3QiwyQ0FBMkM7b0JBQzNDLFVBQVU7b0JBQ1YsSUFBSSxDQUNQLENBQUM7WUFDTixDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ0osVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ2xELENBQUM7WUFDRCxRQUFRLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztZQUMzQixNQUFNLEdBQUcsVUFBVSxDQUFDLE1BQU0sQ0FBQztZQUMzQixFQUFFLENBQUEsQ0FBQyxRQUFRLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBQSxDQUFDO2dCQUNoQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3BCLENBQUM7WUFBQyxJQUFJLENBQUMsRUFBRSxDQUFBLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFBLENBQUM7Z0JBQ3JCLENBQUMsR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDLENBQUMscURBQXFEO1lBQzNFLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxtQ0FBbUMsR0FBRyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztnQkFDbEYsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxHQUFHLE1BQU0sR0FBSSxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUMxRixDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNuRSxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQztBQUNsQixDQUFDLENBQUE7QUFFVSxnQkFBUSxHQUFHLFVBQUMsVUFBVSxFQUFDLFFBQVk7SUFBWix3QkFBWSxHQUFaLFlBQVk7SUFDMUMsTUFBTSxDQUFDLFlBQUksQ0FBQyxVQUFVLEVBQUMsUUFBUSxFQUFDLElBQUksQ0FBQyxDQUFDO0FBQzFDLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS5iYXNoLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuXG5leHBvcnQgbGV0IGJhc2ggPSAoY29tbWFuZEFyZzpzdHJpbmcscmV0cnlBcmcgPSAyLGJhcmVBcmcgPSBmYWxzZSkgPT4ge1xuICAgIGxldCBleGl0Q29kZTpudW1iZXI7XG4gICAgbGV0IHN0ZE91dDpzdHJpbmc7XG4gICAgbGV0IGV4ZWNSZXN1bHQ7XG4gICAgaWYoIXByb2Nlc3MuZW52Lk5QTVRTX1RFU1Qpe1xuICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8PSByZXRyeUFyZzsgaSsrKXtcbiAgICAgICAgICAgIGlmKCFiYXJlQXJnKXtcbiAgICAgICAgICAgICAgICBleGVjUmVzdWx0ID0gcGx1Z2lucy5zaGVsbGpzLmV4ZWMoXG4gICAgICAgICAgICAgICAgICAgIFwiYmFzaCAtYyBcXFwic291cmNlIC91c3IvbG9jYWwvbnZtL252bS5zaCAmJlwiICtcbiAgICAgICAgICAgICAgICAgICAgY29tbWFuZEFyZyArXG4gICAgICAgICAgICAgICAgICAgIFwiXFxcIlwiXG4gICAgICAgICAgICAgICAgKTtcbiAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgZXhlY1Jlc3VsdCA9IHBsdWdpbnMuc2hlbGxqcy5leGVjKGNvbW1hbmRBcmcpO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgZXhpdENvZGUgPSBleGVjUmVzdWx0LmNvZGU7XG4gICAgICAgICAgICBzdGRPdXQgPSBleGVjUmVzdWx0LnN0ZG91dDtcbiAgICAgICAgICAgIGlmKGV4aXRDb2RlICE9PSAwICYmIGkgPT0gcmV0cnlBcmcpe1xuICAgICAgICAgICAgICAgIHByb2Nlc3MuZXhpdCgxKTtcbiAgICAgICAgICAgIH0gZWxzZSBpZihleGl0Q29kZSA9PSAwKXtcbiAgICAgICAgICAgICAgICBpID0gcmV0cnlBcmcgKyAxOyAvLyBpZiBldmVyeXRoaW5nIHdvcmtzIG91dCBvayByZXRyaWFscyBhcmUgbm90IHdhbnRlZFxuICAgICAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy53YXJuKFwiU29tZXRoaW5nIHdlbnQgd3JvbmchIEV4aXQgQ29kZTogXCIgKyBleGl0Q29kZS50b1N0cmluZygpKTtcbiAgICAgICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5pbmZvKFwiUmV0cnkgXCIgKyAoaSArIDEpLnRvU3RyaW5nKCkgKyBcIiBvZiBcIiArICByZXRyeUFyZy50b1N0cmluZygpKTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLmxvZyhcIlNoZWxsRXhlYyB3b3VsZCBiZTogXCIgKyBjb21tYW5kQXJnLmJsdWUpXG4gICAgfVxuICAgIHJldHVybiBzdGRPdXQ7XG59XG5cbmV4cG9ydCBsZXQgYmFzaEJhcmUgPSAoY29tbWFuZEFyZyxyZXRyeUFyZyA9IDIpID0+IHtcbiAgICByZXR1cm4gYmFzaChjb21tYW5kQXJnLHJldHJ5QXJnLHRydWUpO1xufSJdfQ==

dist/npmci.build.docker.d.ts

@@ -1,18 +1,36 @@
 export declare let build: () => any;
+export declare let readDockerfiles: () => any;
+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[], registryArg?: string) => any;
+export declare let testDockerfiles: (sortedArrayArg: Dockerfile[]) => any;
 export declare class Dockerfile {
     filePath: string;
     repo: string;
     version: string;
     cleanTag: string;
     buildTag: string;
+    testTag: string;
+    releaseTag: string;
+    containerName: string;
     content: string;
     baseImage: string;
+    localBaseImageDependent: boolean;
+    localBaseDockerfile: Dockerfile;
     constructor(options: {
         filePath?: string;
         fileContents?: string | Buffer;
         read?: boolean;
     });
-    build(): void;
+    build(): any;
-    push(): void;
+    push(stageArg: any): any;
+    pull(registryArg: string): void;
+    test(): void;
+    getId(): string;
 }
-export declare let dockerTag: (repoArg: string, versionArg: string) => string;
+export declare let dockerFileVersion: (dockerfileNameArg: string) => string;
+export declare let dockerBaseImage: (dockerfileContentArg: 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.command.d.ts

@@ -0,0 +1,2 @@
+import "typings-global";
+export declare let command: (commandArg: any) => any;

dist/npmci.command.js

@@ -0,0 +1,11 @@
+"use strict";
+require("typings-global");
+var plugins = require("./npmci.plugins");
+exports.command = function (commandArg) {
+    var done = plugins.q.defer();
+    console.log(process.argv);
+    done.resolve();
+    return done.promise;
+};
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmNvbW1hbmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBR2hDLGVBQU8sR0FBRyxVQUFDLFVBQVU7SUFDNUIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMxQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtBQUN2QixDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kuY29tbWFuZC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xuXG5leHBvcnQgbGV0IGNvbW1hbmQgPSAoY29tbWFuZEFyZykgPT4ge1xuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKClcbiAgICBjb25zb2xlLmxvZyhwcm9jZXNzLmFyZ3YpO1xuICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgIHJldHVybiBkb25lLnByb21pc2Vcbn0iXX0=

dist/npmci.env.d.ts

@@ -2,8 +2,9 @@ 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 buildStage: string;
-export declare let dockerReleaseTag: string;
 export declare let dockerRegistry: any;
 export declare let dockerFilesBuilt: Dockerfile[];
 export declare let dockerFiles: Dockerfile[];
+export declare let configStore: () => void;
+export declare let configLoad: () => void;

dist/npmci.env.js

@@ -1,8 +1,37 @@
 "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);
+if (process.env.CI_BUILD_REPO)
+    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 () {
+    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 {
+        config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig, "json");
+    }
+    catch (err) {
+        config = {};
+        exports.configStore();
+        plugins.beautylog.log("config initialized!");
+    }
+    config.dockerRegistry ? exports.dockerRegistry = config.dockerRegistry : void (0);
+    config.dockerFilesBuilt ? exports.dockerFilesBuilt = config.dockerFilesBuilt : void (0);
+};
+exports.configLoad();
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBRXhCLDRCQUFzQixhQUFhLENBQUMsQ0FBQTtBQUd6QixZQUFJLEdBQUcsSUFBSSxxQkFBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFLOUMsd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtHaXRSZXBvfSBmcm9tIFwic21hcnRzdHJpbmdcIjtcbmltcG9ydCB7RG9ja2VyZmlsZX0gZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCJcblxuZXhwb3J0IGxldCByZXBvID0gbmV3IEdpdFJlcG8ocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTyk7XG5leHBvcnQgbGV0IGRvY2tlclRlc3RUYWc6c3RyaW5nO1xuZXhwb3J0IGxldCBkb2NrZXJSZWxlYXNlVGFnOnN0cmluZztcblxuZXhwb3J0IGxldCBkb2NrZXJSZWdpc3RyeTsgLy8gd2lsbCBiZSBzZXQgYnkgbnBtY2kucHJlcGFyZVxuZXhwb3J0IGxldCBkb2NrZXJGaWxlc0J1aWx0OkRvY2tlcmZpbGVbXSA9IFtdO1xuZXhwb3J0IGxldCBkb2NrZXJGaWxlczpEb2NrZXJmaWxlW10gPSBbXTtcblxuIl19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLmVudi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFDM0MsSUFBWSxLQUFLLFdBQU0sZUFBZSxDQUFDLENBQUE7QUFDdkMsNEJBQXNCLGFBQWEsQ0FBQyxDQUFBO0FBSXBDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDO0lBQUMsWUFBSSxHQUFHLElBQUkscUJBQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBRWpFLGtCQUFVLEdBQVUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUM7QUFJL0Msd0JBQWdCLEdBQWdCLEVBQUUsQ0FBQztBQUNuQyxtQkFBVyxHQUFnQixFQUFFLENBQUM7QUFFOUIsbUJBQVcsR0FBRztJQUNyQixJQUFJLE1BQU0sR0FBRztRQUNULGNBQWMsRUFBRSxzQkFBYztRQUM5QixnQkFBZ0IsRUFBRSx3QkFBZ0I7UUFDbEMsV0FBVyxFQUFFLG1CQUFXO0tBQzNCLENBQUE7SUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQzdCLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEVBQ3RCO1FBQ0ksUUFBUSxFQUFDLGFBQWE7UUFDdEIsUUFBUSxFQUFDLEtBQUssQ0FBQyxnQkFBZ0I7S0FDbEMsQ0FDSixDQUFDO0FBQ04sQ0FBQyxDQUFBO0FBRVUsa0JBQVUsR0FBRztJQUNwQixJQUFJLE1BQU0sQ0FBQztJQUNYLElBQUksQ0FBQztRQUNELE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLGtCQUFrQixFQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ25GLENBQ0E7SUFBQSxLQUFLLENBQUEsQ0FBQyxHQUFHLENBQUMsQ0FBQSxDQUFDO1FBQ1AsTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUNaLG1CQUFXLEVBQUUsQ0FBQztRQUNkLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUM7SUFDakQsQ0FBQztJQUVELE1BQU0sQ0FBQyxjQUFjLEdBQUcsc0JBQWMsR0FBRyxNQUFNLENBQUMsY0FBYyxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN6RSxNQUFNLENBQUMsZ0JBQWdCLEdBQUcsd0JBQWdCLEdBQUcsTUFBTSxDQUFDLGdCQUFnQixHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNuRixDQUFDLENBQUE7QUFDRCxrQkFBVSxFQUFFLENBQUMiLCJmaWxlIjoibnBtY2kuZW52LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0ICogYXMgcGF0aHMgZnJvbSBcIi4vbnBtY2kucGF0aHNcIjtcbmltcG9ydCB7R2l0UmVwb30gZnJvbSBcInNtYXJ0c3RyaW5nXCI7XG5pbXBvcnQge0RvY2tlcmZpbGV9IGZyb20gXCIuL25wbWNpLmJ1aWxkLmRvY2tlclwiXG5cbmV4cG9ydCBsZXQgcmVwbzpHaXRSZXBvO1xuaWYocHJvY2Vzcy5lbnYuQ0lfQlVJTERfUkVQTykgcmVwbyA9IG5ldyBHaXRSZXBvKHByb2Nlc3MuZW52LkNJX0JVSUxEX1JFUE8pO1xuXG5leHBvcnQgbGV0IGJ1aWxkU3RhZ2U6c3RyaW5nID0gcHJvY2Vzcy5lbnYuQ0lfQlVJTERfU1RBR0U7XG5cbi8vIGhhbmRsaW5nIGNvbmZpZyBiZXR3ZWVuIGNvbW1hbmRzXG5leHBvcnQgbGV0IGRvY2tlclJlZ2lzdHJ5OyAvLyB3aWxsIGJlIHNldCBieSBucG1jaS5wcmVwYXJlXG5leHBvcnQgbGV0IGRvY2tlckZpbGVzQnVpbHQ6RG9ja2VyZmlsZVtdID0gW107XG5leHBvcnQgbGV0IGRvY2tlckZpbGVzOkRvY2tlcmZpbGVbXSA9IFtdO1xuXG5leHBvcnQgbGV0IGNvbmZpZ1N0b3JlID0gKCkgPT4ge1xuICAgIGxldCBjb25maWcgPSB7XG4gICAgICAgIGRvY2tlclJlZ2lzdHJ5OiBkb2NrZXJSZWdpc3RyeSxcbiAgICAgICAgZG9ja2VyRmlsZXNCdWlsdDogZG9ja2VyRmlsZXNCdWlsdCxcbiAgICAgICAgZG9ja2VyRmlsZXM6IGRvY2tlckZpbGVzXG4gICAgfVxuICAgIHBsdWdpbnMuc21hcnRmaWxlLm1lbW9yeS50b0ZzU3luYyhcbiAgICAgICAgSlNPTi5zdHJpbmdpZnkoY29uZmlnKSxcbiAgICAgICAge1xuICAgICAgICAgICAgZmlsZU5hbWU6XCJjb25maWcuanNvblwiLFxuICAgICAgICAgICAgZmlsZVBhdGg6cGF0aHMuTnBtY2lQYWNrYWdlUm9vdFxuICAgICAgICB9XG4gICAgKTtcbn1cblxuZXhwb3J0IGxldCBjb25maWdMb2FkID0gKCkgPT4ge1xuICAgIGxldCBjb25maWc7XG4gICAgdHJ5IHtcbiAgICAgICAgY29uZmlnID0gcGx1Z2lucy5zbWFydGZpbGUubG9jYWwudG9PYmplY3RTeW5jKHBhdGhzLk5wbWNpUGFja2FnZUNvbmZpZyxcImpzb25cIik7XG4gICAgfVxuICAgIGNhdGNoKGVycil7XG4gICAgICAgIGNvbmZpZyA9IHt9O1xuICAgICAgICBjb25maWdTdG9yZSgpO1xuICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5sb2coXCJjb25maWcgaW5pdGlhbGl6ZWQhXCIpO1xuICAgIH1cbiAgICBcbiAgICBjb25maWcuZG9ja2VyUmVnaXN0cnkgPyBkb2NrZXJSZWdpc3RyeSA9IGNvbmZpZy5kb2NrZXJSZWdpc3RyeSA6IHZvaWQoMCk7XG4gICAgY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgPyBkb2NrZXJGaWxlc0J1aWx0ID0gY29uZmlnLmRvY2tlckZpbGVzQnVpbHQgOiB2b2lkKDApO1xufVxuY29uZmlnTG9hZCgpOyJdfQ==

dist/npmci.get.js

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

dist/npmci.paths.d.ts

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

dist/npmci.paths.js

@@ -0,0 +1,10 @@
+"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");
+exports.NpmciProjectDir = exports.cwd;
+exports.NpmciTestDir = plugins.path.join(exports.cwd, "./test");
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsSUFBWSxPQUFPLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUVoQyxXQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBRXBCLHdCQUFnQixHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxLQUFLLENBQUMsQ0FBQztBQUN0RCwwQkFBa0IsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyx3QkFBZ0IsRUFBQyxlQUFlLENBQUMsQ0FBQztBQUN6RSx1QkFBZSxHQUFHLFdBQUcsQ0FBQztBQUN0QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQUcsRUFBQyxRQUFRLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS5wYXRocy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcblxuZXhwb3J0IGxldCBjd2QgPSBwcm9jZXNzLmN3ZCgpO1xuXG5leHBvcnQgbGV0IE5wbWNpUGFja2FnZVJvb3QgPSBwbHVnaW5zLnBhdGguam9pbihfX2Rpcm5hbWUsXCIuLi9cIik7XG5leHBvcnQgbGV0IE5wbWNpUGFja2FnZUNvbmZpZyA9IHBsdWdpbnMucGF0aC5qb2luKE5wbWNpUGFja2FnZVJvb3QsXCIuL2NvbmZpZy5qc29uXCIpO1xuZXhwb3J0IGxldCBOcG1jaVByb2plY3REaXIgPSBjd2Q7XG5leHBvcnQgbGV0IE5wbWNpVGVzdERpciA9IHBsdWdpbnMucGF0aC5qb2luKGN3ZCxcIi4vdGVzdFwiKTsiXX0=

dist/npmci.plugins.d.ts

@@ -4,6 +4,7 @@ export declare let commander: any;
 export declare let gulp: any;
 export declare let gulpFunction: any;
 export import path = require("path");
+export import projectinfo = require("projectinfo");
 export declare let q: any;
 export declare let request: any;
 export declare let shelljs: any;

dist/npmci.plugins.js

@@ -5,6 +5,7 @@ exports.commander = require("commander");
 exports.gulp = require("gulp");
 exports.gulpFunction = require("gulp-function");
 exports.path = require("path");
+exports.projectinfo = require("projectinfo");
 exports.q = require("q");
 exports.request = require("request");
 exports.shelljs = require("shelljs");
@@ -13,4 +14,4 @@ exports.smartstring = require("smartstring");
 exports.smartfile = require("smartfile");
 exports.through2 = require("through2");
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUNyQyxZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDMUIsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsZ0JBQVEsV0FBVyxVQUFVLENBQUMsQ0FBQztBQUMvQixtQkFBVyxXQUFXLGFBQWEsQ0FBQyxDQUFDO0FBQ3JDLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsZ0JBQVEsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5leHBvcnQgaW1wb3J0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XG5leHBvcnQgbGV0IGNvbW1hbmRlciA9IHJlcXVpcmUoXCJjb21tYW5kZXJcIik7XG5leHBvcnQgbGV0IGd1bHAgPSByZXF1aXJlKFwiZ3VscFwiKTtcbmV4cG9ydCBsZXQgZ3VscEZ1bmN0aW9uID0gcmVxdWlyZShcImd1bHAtZnVuY3Rpb25cIik7XG5leHBvcnQgaW1wb3J0IHBhdGggPSByZXF1aXJlKFwicGF0aFwiKTtcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xuZXhwb3J0IGxldCByZXF1ZXN0ID0gcmVxdWlyZShcInJlcXVlc3RcIik7XG5leHBvcnQgbGV0IHNoZWxsanMgPSByZXF1aXJlKFwic2hlbGxqc1wiKTtcbmV4cG9ydCBpbXBvcnQgc21hcnRzc2ggPSByZXF1aXJlKFwic21hcnRzc2hcIik7XG5leHBvcnQgaW1wb3J0IHNtYXJ0c3RyaW5nID0gcmVxdWlyZShcInNtYXJ0c3RyaW5nXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydGZpbGUgPSByZXF1aXJlKFwic21hcnRmaWxlXCIpO1xuZXhwb3J0IGxldCB0aHJvdWdoMiA9IHJlcXVpcmUoXCJ0aHJvdWdoMlwiKTsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUNWLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixvQkFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztBQUNyQyxZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDdkIsbUJBQVcsV0FBVyxhQUFhLENBQUMsQ0FBQztBQUN4QyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDN0IsZUFBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztBQUMxQixnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLG1CQUFXLFdBQVcsYUFBYSxDQUFDLENBQUM7QUFDckMsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNwQyxnQkFBUSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmV4cG9ydCBpbXBvcnQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcbmV4cG9ydCBsZXQgY29tbWFuZGVyID0gcmVxdWlyZShcImNvbW1hbmRlclwiKTtcbmV4cG9ydCBsZXQgZ3VscCA9IHJlcXVpcmUoXCJndWxwXCIpO1xuZXhwb3J0IGxldCBndWxwRnVuY3Rpb24gPSByZXF1aXJlKFwiZ3VscC1mdW5jdGlvblwiKTtcbmV4cG9ydCBpbXBvcnQgcGF0aCA9IHJlcXVpcmUoXCJwYXRoXCIpO1xuZXhwb3J0IGltcG9ydCBwcm9qZWN0aW5mbyA9IHJlcXVpcmUoXCJwcm9qZWN0aW5mb1wiKTtcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpO1xuZXhwb3J0IGxldCByZXF1ZXN0ID0gcmVxdWlyZShcInJlcXVlc3RcIik7XG5leHBvcnQgbGV0IHNoZWxsanMgPSByZXF1aXJlKFwic2hlbGxqc1wiKTtcbmV4cG9ydCBpbXBvcnQgc21hcnRzc2ggPSByZXF1aXJlKFwic21hcnRzc2hcIik7XG5leHBvcnQgaW1wb3J0IHNtYXJ0c3RyaW5nID0gcmVxdWlyZShcInNtYXJ0c3RyaW5nXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydGZpbGUgPSByZXF1aXJlKFwic21hcnRmaWxlXCIpO1xuZXhwb3J0IGxldCB0aHJvdWdoMiA9IHJlcXVpcmUoXCJ0aHJvdWdoMlwiKTsiXX0=

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,18 +25,11 @@ var publishNpm = function () {
 };
 var publishDocker = function () {
     var done = plugins.q.defer();
-    NpmciEnv.dockerFilesBuilt.forEach(function (dockerfileArg) {
+    NpmciBuildDocker.readDockerfiles()
-        dockerfileArg.push();
+        .then(NpmciBuildDocker.pullDockerfileImages)
-    });
+        .then(NpmciBuildDocker.pushDockerfiles)
-    return done.promise;
+        .then(done.resolve);
-};
-var publishDockerTest = function () {
-    var done = plugins.q.defer();
-    NpmciEnv.dockerFilesBuilt.forEach(function (dockerfileArg) {
-        dockerfileArg.push();
-    });
-    done.resolve();
     return done.promise;
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyxJQUFZLFFBQVEsV0FBTSxhQUFhLENBQUMsQ0FBQTtBQUU3QixlQUFPLEdBQUcsVUFBQyxVQUF5QjtJQUF6QiwwQkFBeUIsR0FBekIsa0JBQXlCO0lBQzNDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFBLENBQUM7UUFDaEIsS0FBSyxLQUFLO1lBQ04sTUFBTSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ3hCLEtBQUssUUFBUTtZQUNULE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUMvQixDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRUYsSUFBSSxVQUFVLEdBQUk7SUFDZCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLHVCQUFPLENBQUMsS0FBSyxDQUFDO1NBQ1QsSUFBSSxDQUFDO1FBQ0YsaUJBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBRTtRQUMvQixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN2QixDQUFDLENBQUE7QUFFRCxJQUFJLGFBQWEsR0FBRztJQUNoQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsVUFBUyxhQUFhO1FBQ3BELGFBQWEsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN6QixDQUFDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQztBQUVGLElBQUksaUJBQWlCLEdBQUc7SUFDcEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixRQUFRLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLFVBQVMsYUFBYTtRQUNwRCxhQUFhLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDekIsQ0FBQyxDQUFDLENBQUM7SUFDSCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDZixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUEiLCJmaWxlIjoibnBtY2kucHVibGlzaC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcbmltcG9ydCB7cHJlcGFyZX0gZnJvbSBcIi4vbnBtY2kucHJlcGFyZVwiO1xuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XG5pbXBvcnQgKiBhcyBOcG1jaUVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcblxuZXhwb3J0IGxldCBwdWJsaXNoID0gKHNlcnZpY2VBcmc6c3RyaW5nID0gXCJucG1cIikgPT4ge1xuICAgIHN3aXRjaCAoc2VydmljZUFyZyl7XG4gICAgICAgIGNhc2UgXCJucG1cIjogXG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaE5wbSgpO1xuICAgICAgICBjYXNlIFwiZG9ja2VyXCI6XG4gICAgICAgICAgICByZXR1cm4gcHVibGlzaERvY2tlcigpO1xuICAgIH1cbn07XG5cbmxldCBwdWJsaXNoTnBtICA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBwcmVwYXJlKFwibnBtXCIpXG4gICAgICAgIC50aGVuKGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICBiYXNoKFwibnBtIHB1Ymxpc2hcIik7XG4gICAgICAgICAgICBwbHVnaW5zLmJlYXV0eWxvZy5vayhcIkRvbmUhXCIpIDtcbiAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgICAgICB9KTtcbiAgIHJldHVybiBkb25lLnByb21pc2U7XG59XG5cbmxldCBwdWJsaXNoRG9ja2VyID0gZnVuY3Rpb24oKXtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIE5wbWNpRW52LmRvY2tlckZpbGVzQnVpbHQuZm9yRWFjaChmdW5jdGlvbihkb2NrZXJmaWxlQXJnKXtcbiAgICAgICAgZG9ja2VyZmlsZUFyZy5wdXNoKCk7XG4gICAgfSk7XG4gICAgcmV0dXJuIGRvbmUucHJvbWlzZTtcbn07XG5cbmxldCBwdWJsaXNoRG9ja2VyVGVzdCA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBOcG1jaUVudi5kb2NrZXJGaWxlc0J1aWx0LmZvckVhY2goZnVuY3Rpb24oZG9ja2VyZmlsZUFyZyl7XG4gICAgICAgIGRvY2tlcmZpbGVBcmcucHVzaCgpO1xuICAgIH0pO1xuICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgIHJldHVybiBkb25lLnByb21pc2U7XG59Il19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnB1Ymxpc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDhCQUFzQixpQkFBaUIsQ0FBQyxDQUFBO0FBQ3hDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUVsQyxJQUFZLGdCQUFnQixXQUFNLHNCQUVsQyxDQUFDLENBRnVEO0FBRTdDLGVBQU8sR0FBRyxVQUFDLFVBQXlCO0lBQXpCLDBCQUF5QixHQUF6QixrQkFBeUI7SUFDM0MsTUFBTSxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUEsQ0FBQztRQUNoQixLQUFLLEtBQUs7WUFDTixNQUFNLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDeEIsS0FBSyxRQUFRO1lBQ1QsTUFBTSxDQUFDLGFBQWEsRUFBRSxDQUFDO0lBQy9CLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFRixJQUFJLFVBQVUsR0FBSTtJQUNkLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsdUJBQU8sQ0FBQyxLQUFLLENBQUM7U0FDVCxJQUFJLENBQUM7UUFDRixpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3BCLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFFO1FBQy9CLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNuQixDQUFDLENBQUMsQ0FBQztJQUNSLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3ZCLENBQUMsQ0FBQTtBQUVELElBQUksYUFBYSxHQUFHO0lBQ2hCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDekIsZ0JBQWdCLENBQUMsZUFBZSxFQUFFO1NBQ2pDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxvQkFBb0IsQ0FBQztTQUMzQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDO1NBQ3RDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDeEIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFDIiwiZmlsZSI6Im5wbWNpLnB1Ymxpc2guanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9ucG1jaS5wbHVnaW5zXCI7XG5pbXBvcnQge3ByZXBhcmV9IGZyb20gXCIuL25wbWNpLnByZXBhcmVcIjtcbmltcG9ydCB7YmFzaH0gZnJvbSBcIi4vbnBtY2kuYmFzaFwiO1xuaW1wb3J0ICogYXMgTnBtY2lFbnYgZnJvbSBcIi4vbnBtY2kuZW52XCI7XG5pbXBvcnQgKiBhcyBOcG1jaUJ1aWxkRG9ja2VyIGZyb20gXCIuL25wbWNpLmJ1aWxkLmRvY2tlclwiXG5cbmV4cG9ydCBsZXQgcHVibGlzaCA9IChzZXJ2aWNlQXJnOnN0cmluZyA9IFwibnBtXCIpID0+IHtcbiAgICBzd2l0Y2ggKHNlcnZpY2VBcmcpe1xuICAgICAgICBjYXNlIFwibnBtXCI6IFxuICAgICAgICAgICAgcmV0dXJuIHB1Ymxpc2hOcG0oKTtcbiAgICAgICAgY2FzZSBcImRvY2tlclwiOlxuICAgICAgICAgICAgcmV0dXJuIHB1Ymxpc2hEb2NrZXIoKTtcbiAgICB9XG59O1xuXG5sZXQgcHVibGlzaE5wbSAgPSBmdW5jdGlvbigpe1xuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XG4gICAgcHJlcGFyZShcIm5wbVwiKVxuICAgICAgICAudGhlbihmdW5jdGlvbigpe1xuICAgICAgICAgICAgYmFzaChcIm5wbSBwdWJsaXNoXCIpO1xuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cub2soXCJEb25lIVwiKSA7XG4gICAgICAgICAgICBkb25lLnJlc29sdmUoKTtcbiAgICAgICAgfSk7XG4gICByZXR1cm4gZG9uZS5wcm9taXNlO1xufVxuXG5sZXQgcHVibGlzaERvY2tlciA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICAgICAgTnBtY2lCdWlsZERvY2tlci5yZWFkRG9ja2VyZmlsZXMoKVxuICAgICAgICAudGhlbihOcG1jaUJ1aWxkRG9ja2VyLnB1bGxEb2NrZXJmaWxlSW1hZ2VzKVxuICAgICAgICAudGhlbihOcG1jaUJ1aWxkRG9ja2VyLnB1c2hEb2NrZXJmaWxlcylcbiAgICAgICAgLnRoZW4oZG9uZS5yZXNvbHZlKTtcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xufTsiXX0=

dist/npmci.test.docker.d.ts

@@ -0,0 +1 @@
+export declare let testDocker: () => void;

dist/npmci.test.docker.js

@@ -0,0 +1,5 @@
+"use strict";
+exports.testDocker = function () {
+};
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRlc3QuZG9ja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFLVyxrQkFBVSxHQUFHO0FBRXhCLENBQUMsQ0FBQyIsImZpbGUiOiJucG1jaS50ZXN0LmRvY2tlci5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiXG5pbXBvcnQgKiBhcyBOcG1jaUVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcbmltcG9ydCB7YmFzaEJhcmV9IGZyb20gXCIuL25wbWNpLmJhc2hcIjtcbmltcG9ydCAqIGFzIE5wbWNpQnVpbGREb2NrZXIgZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCI7XG5cbmV4cG9ydCBsZXQgdGVzdERvY2tlciA9ICgpID0+IHtcblxufTsiXX0=

dist/npmci.test.js

@@ -3,6 +3,7 @@ require("typings-global");
 var plugins = require("./npmci.plugins");
 var npmci_bash_1 = require("./npmci.bash");
 var npmci_install_1 = require("./npmci.install");
+var NpmciBuildDocker = require("./npmci.build.docker");
 exports.test = function (versionArg) {
     var done = plugins.q.defer();
     if (versionArg == "docker") {
@@ -14,10 +15,8 @@ exports.test = function (versionArg) {
     else {
         npmci_install_1.install(versionArg)
             .then(npmDependencies)
+            .then(npmTest)
             .then(function () {
-            plugins.beautylog.info("now starting tests:");
-            npmci_bash_1.bash("npm test");
-            plugins.beautylog.success("test finished");
             done.resolve();
         });
     }
@@ -30,10 +29,20 @@ var npmDependencies = function () {
     done.resolve();
     return done.promise;
 };
-var testDocker = function () {
+var npmTest = function () {
     var done = plugins.q.defer();
+    plugins.beautylog.info("now starting tests:");
+    npmci_bash_1.bash("npm test");
     done.resolve();
     return done.promise;
 };
+var testDocker = function () {
+    var done = plugins.q.defer();
+    NpmciBuildDocker.readDockerfiles()
+        .then(NpmciBuildDocker.pullDockerfileImages)
+        .then(NpmciBuildDocker.testDockerfiles)
+        .then(done.resolve);
+    return done.promise;
+};
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUc3QixZQUFJLEdBQUcsVUFBQyxVQUFVO0lBQ3pCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsRUFBRSxDQUFBLENBQUMsVUFBVSxJQUFJLFFBQVEsQ0FBQyxDQUFBLENBQUM7UUFDdkIsVUFBVSxFQUFFO2FBQ1AsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osdUJBQU8sQ0FBQyxVQUFVLENBQUM7YUFDZCxJQUFJLENBQUMsZUFBZSxDQUFDO2FBQ3JCLElBQUksQ0FBQztZQUNGLE9BQU8sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLENBQUM7WUFDOUMsaUJBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUNqQixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUMzQyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDWCxDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxlQUFlLEdBQUc7SUFDbEIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO0lBQ3ZELGlCQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDcEIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBRTdCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS50ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcbmltcG9ydCAqIGFzIGVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcblxuZXhwb3J0IGxldCB0ZXN0ID0gKHZlcnNpb25BcmcpID0+IHtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIGlmKHZlcnNpb25BcmcgPT0gXCJkb2NrZXJcIil7XG4gICAgICAgIHRlc3REb2NrZXIoKVxuICAgICAgICAgICAgLnRoZW4oKCk9PntcbiAgICAgICAgICAgICAgICBkb25lLnJlc29sdmUoKTtcbiAgICAgICAgICAgIH0pO1xuICAgIH0gZWxzZSB7XG4gICAgICAgIGluc3RhbGwodmVyc2lvbkFyZylcbiAgICAgICAgICAgIC50aGVuKG5wbURlcGVuZGVuY2llcylcbiAgICAgICAgICAgIC50aGVuKCgpPT57XG4gICAgICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cuaW5mbyhcIm5vdyBzdGFydGluZyB0ZXN0czpcIik7XG4gICAgICAgICAgICAgICAgYmFzaChcIm5wbSB0ZXN0XCIpO1xuICAgICAgICAgICAgICAgIHBsdWdpbnMuYmVhdXR5bG9nLnN1Y2Nlc3MoXCJ0ZXN0IGZpbmlzaGVkXCIpO1xuICAgICAgICAgICAgICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgICAgICAgICAgfSk7XG4gICAgfVxuICAgIHJldHVybiBkb25lLnByb21pc2U7XG59XG5cbmxldCBucG1EZXBlbmRlbmNpZXMgPSBmdW5jdGlvbigpe1xuICAgIGxldCBkb25lID0gcGx1Z2lucy5xLmRlZmVyKCk7XG4gICAgcGx1Z2lucy5iZWF1dHlsb2cuaW5mbyhcIm5vdyBpbnN0YWxsaW5nIGRlcGVuZGVuY2llczpcIik7XG4gICAgYmFzaChcIm5wbSBpbnN0YWxsXCIpO1xuICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgIHJldHVybiBkb25lLnByb21pc2U7XG59XG5cbmxldCB0ZXN0RG9ja2VyID0gZnVuY3Rpb24oKXtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIFxuICAgIGRvbmUucmVzb2x2ZSgpO1xuICAgIHJldHVybiBkb25lLnByb21pc2U7XG59XG5cbiJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQTtBQUN4QixJQUFZLE9BQU8sV0FBTSxpQkFBaUIsQ0FBQyxDQUFBO0FBQzNDLDJCQUFtQixjQUFjLENBQUMsQ0FBQTtBQUNsQyw4QkFBc0IsaUJBQWlCLENBQUMsQ0FBQTtBQUV4QyxJQUFZLGdCQUFnQixXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFFOUMsWUFBSSxHQUFHLFVBQUMsVUFBVTtJQUN6QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLEVBQUUsQ0FBQSxDQUFDLFVBQVUsSUFBSSxRQUFRLENBQUMsQ0FBQSxDQUFDO1FBQ3ZCLFVBQVUsRUFBRTthQUNQLElBQUksQ0FBQztZQUNGLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNYLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLHVCQUFPLENBQUMsVUFBVSxDQUFDO2FBQ2QsSUFBSSxDQUFDLGVBQWUsQ0FBQzthQUNyQixJQUFJLENBQUMsT0FBTyxDQUFDO2FBQ2IsSUFBSSxDQUFDO1lBQ0YsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ25CLENBQUMsQ0FBQyxDQUFDO0lBQ1gsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQTtBQUVELElBQUksZUFBZSxHQUFHO0lBQ2xCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsOEJBQThCLENBQUMsQ0FBQztJQUN2RCxpQkFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3BCLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNmLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQTtBQUVELElBQUksT0FBTyxHQUFHO0lBQ1YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDO0lBQzlDLGlCQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDakIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxVQUFVLEdBQUc7SUFDYixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLGdCQUFnQixDQUFDLGVBQWUsRUFBRTtTQUM3QixJQUFJLENBQUMsZ0JBQWdCLENBQUMsb0JBQW9CLENBQUM7U0FDM0MsSUFBSSxDQUFDLGdCQUFnQixDQUFDLGVBQWUsQ0FBQztTQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3ZCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0FBQ3hCLENBQUMsQ0FBQSIsImZpbGUiOiJucG1jaS50ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuaW1wb3J0IHtiYXNofSBmcm9tIFwiLi9ucG1jaS5iYXNoXCI7XG5pbXBvcnQge2luc3RhbGx9IGZyb20gXCIuL25wbWNpLmluc3RhbGxcIjtcbmltcG9ydCAqIGFzIGVudiBmcm9tIFwiLi9ucG1jaS5lbnZcIjtcbmltcG9ydCAqIGFzIE5wbWNpQnVpbGREb2NrZXIgZnJvbSBcIi4vbnBtY2kuYnVpbGQuZG9ja2VyXCI7XG5cbmV4cG9ydCBsZXQgdGVzdCA9ICh2ZXJzaW9uQXJnKSA9PiB7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBpZih2ZXJzaW9uQXJnID09IFwiZG9ja2VyXCIpe1xuICAgICAgICB0ZXN0RG9ja2VyKClcbiAgICAgICAgICAgIC50aGVuKCgpPT57XG4gICAgICAgICAgICAgICAgZG9uZS5yZXNvbHZlKCk7XG4gICAgICAgICAgICB9KTtcbiAgICB9IGVsc2Uge1xuICAgICAgICBpbnN0YWxsKHZlcnNpb25BcmcpXG4gICAgICAgICAgICAudGhlbihucG1EZXBlbmRlbmNpZXMpXG4gICAgICAgICAgICAudGhlbihucG1UZXN0KVxuICAgICAgICAgICAgLnRoZW4oKCk9PntcbiAgICAgICAgICAgICAgICBkb25lLnJlc29sdmUoKTtcbiAgICAgICAgICAgIH0pO1xuICAgIH1cbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xufVxuXG5sZXQgbnBtRGVwZW5kZW5jaWVzID0gZnVuY3Rpb24oKXtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJub3cgaW5zdGFsbGluZyBkZXBlbmRlbmNpZXM6XCIpO1xuICAgIGJhc2goXCJucG0gaW5zdGFsbFwiKTtcbiAgICBkb25lLnJlc29sdmUoKTtcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xufVxuXG5sZXQgbnBtVGVzdCA9ICgpID0+IHtcbiAgICBsZXQgZG9uZSA9IHBsdWdpbnMucS5kZWZlcigpO1xuICAgIHBsdWdpbnMuYmVhdXR5bG9nLmluZm8oXCJub3cgc3RhcnRpbmcgdGVzdHM6XCIpO1xuICAgIGJhc2goXCJucG0gdGVzdFwiKTtcbiAgICBkb25lLnJlc29sdmUoKTtcbiAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xufVxuXG5sZXQgdGVzdERvY2tlciA9IGZ1bmN0aW9uKCl7XG4gICAgbGV0IGRvbmUgPSBwbHVnaW5zLnEuZGVmZXIoKTtcbiAgICBOcG1jaUJ1aWxkRG9ja2VyLnJlYWREb2NrZXJmaWxlcygpXG4gICAgICAgIC50aGVuKE5wbWNpQnVpbGREb2NrZXIucHVsbERvY2tlcmZpbGVJbWFnZXMpXG4gICAgICAgIC50aGVuKE5wbWNpQnVpbGREb2NrZXIudGVzdERvY2tlcmZpbGVzKVxuICAgICAgICAudGhlbihkb25lLnJlc29sdmUpXG4gICAgcmV0dXJuIGRvbmUucHJvbWlzZTtcbn1cblxuIl19

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.1.17",
+  "version": "2.1.52",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -20,19 +20,22 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmci#README",
   "devDependencies": {
-    "npmts": "^5.2.1"
+    "npmts-g": "^5.2.6",
+    "should": "^9.0.1",
+    "typings-test": "^1.0.1"
   },
   "dependencies": {
     "beautylog": "^5.0.8",
     "commander": "^2.9.0",
     "gulp": "^3.9.1",
     "gulp-function": "^1.3.5",
+    "projectinfo": "^1.0.3",
     "q": "^1.4.1",
     "request": "^2.72.0",
     "shelljs": "^0.7.0",
     "smartfile": "^3.0.10",
     "smartssh": "^1.0.5",
-    "smartstring": "^2.0.4",
+    "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/assets/test/test_latest.sh

@@ -0,0 +1,2 @@
+npm -v
+node -v

test/test.d.ts

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

test/test.ts

@@ -0,0 +1,84 @@
+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 npmci = require("../dist/index");
+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, then test it",function(done){
+            NpmciTest.test("legacy")
+                .then(() => {
+                    return NpmciTest.test("lts");
+                })
+                .then(() => {
+                    return NpmciTest.test("stable");
+                })
+                .then(() => {
+                    done();
+                });
+        })
+    });
+    describe("test.docker",function(){
+        it("should test dockerfiles",function(done){
+            NpmciTest.test("docker")
+                .then(() => {
+                    done();
+                });
+        })
+    });
+})

ts/index.ts

@@ -1,22 +1,26 @@
 #!/usr/bin/env node
 import "typings-global";
 import * as plugins from "./npmci.plugins";
-
+import * as paths from "./npmci.paths";
-let packJson = require("../package.json");
+let npmciInfo = new plugins.projectinfo.ProjectinfoNpm(paths.NpmciPackageRoot);
-
+plugins.beautylog.log("npmci version: " + npmciInfo.version);
-plugins.beautylog.info("npmci version: " + packJson.version);
 
 import {build} from "./npmci.build"
+import {command as command2} from "./npmci.command";
 import {install} from "./npmci.install";
 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";
+import * as NpmciEnv from "./npmci.env";
 
+export {build} from "./npmci.build"
+export {install} from "./npmci.install";
+export {publish} from "./npmci.publish";
 
 let command;
-let commandOption;
+let commandOption:string;
 
 plugins.commander
     .arguments('<commandarg> [commandoptionarg]')
@@ -34,24 +38,35 @@ if (typeof command === 'undefined') {
 
 switch (command){
     case "build":
-        build(commandOption);
+        build(commandOption)
+            .then(NpmciEnv.configStore);
+        break;
+    case "command":
+        command()
+            .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();
         break;
     default:
+        plugins.beautylog.error("command " + commandOption.blue + " not recognised");
+        process.exit(1);
         break;
 }
 

ts/npmci.bash.ts

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

ts/npmci.build.docker.ts

@@ -1,114 +1,198 @@
-import * as plugins from "./npmci.plugins"
+import * as plugins from "./npmci.plugins";
+import * as paths from "./npmci.paths";
 import * as NpmciEnv from "./npmci.env";
-
+import {bashBare} from "./npmci.bash";
 
 export let build = function(){
     let done = plugins.q.defer();
-    plugins.gulp.src("./Dockerfile*")
+    readDockerfiles()
-        .pipe(readDockerfiles())
+        .then(sortDockerfiles)
-        .pipe(plugins.gulpFunction(function(){
+        .then(mapDockerfiles)
-            sortDockerfiles()
+        .then(buildDockerfiles)
-                .then(buildDockerfiles)
+        .then(pushDockerfiles)
-                .then(done.resolve);
+        .then(() => {
-        },"atEnd"));
-    return done.promise;
-}
-
-let readDockerfiles = function(){
-    return plugins.through2.obj(function(file,enc,cb){
-        let myDockerfile = new Dockerfile({
-            filePath:file.path,
-            read:true
-        });
-        NpmciEnv.dockerFiles.push(
-            myDockerfile
-        );
-        cb(null,file);
-    });
-}
-
-let sortDockerfiles = function(){
-    let done = plugins.q.defer();
-    let redoSort:boolean;
-    let sortFunction = function(){
-        redoSort = false;
-        let notYetBuiltImages:string[] = [];
-        NpmciEnv.dockerFiles.forEach((dockerFileArg)=>{
-            notYetBuiltImages.push(dockerFileArg.cleanTag);
-        });
-        NpmciEnv.dockerFiles.sort(function(a,b){
-            plugins.beautylog.log("sort build order for Dockerimages");
-            let aIndex = notYetBuiltImages.indexOf(a.cleanTag);
-            if(aIndex != -1){notYetBuiltImages.splice(aIndex,1)}
-            if(notYetBuiltImages.indexOf(b.cleanTag) != -1){
-                redoSort = true;
-                return -1;
-            } else {
-                return 0
-            }
-        });
-        if(redoSort){
-            sortFunction();
-        } else {
             done.resolve();
-        }
+        });
-    };
-    sortFunction();
     return done.promise;
 }
 
-let buildDockerfiles = function(){
+export let readDockerfiles = function(){
     let done = plugins.q.defer();
-    NpmciEnv.dockerFiles.forEach(function(dockerfileArg){
+    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 sortDockerfiles = function(sortableArrayArg:Dockerfile[]){
+    let done = plugins.q.defer();
+    let sortedArray:Dockerfile[] = [];
+    let cleanTagsOriginal = cleanTagsArrayFunction(sortableArrayArg,sortedArray);
+    let sorterFunctionCounter:number = 0;
+    let sorterFunction = function(){
+        sortableArrayArg.forEach((dockerfileArg)=>{
+            let cleanTags = cleanTagsArrayFunction(sortableArrayArg,sortedArray);
+            if(cleanTags.indexOf(dockerfileArg.baseImage) == -1 && sortedArray.indexOf(dockerfileArg) == -1){
+                sortedArray.push(dockerfileArg);
+            };
+            if(cleanTagsOriginal.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 = (sortedArrayArg:Dockerfile[]) => {
+    let done = plugins.q.defer();
+    sortedArrayArg.forEach(function(dockerfileArg){
         dockerfileArg.build();
     })
-    done.resolve();
+    done.resolve(sortedArrayArg);
     return done.promise;
 }
 
+export let pushDockerfiles = function(sortedArrayArg:Dockerfile[]){
+    let done = plugins.q.defer();
+    sortedArrayArg.forEach(function(dockerfileArg){
+        dockerfileArg.push(NpmciEnv.buildStage);
+    });
+    done.resolve(sortedArrayArg);
+    return done.promise;
+}
+
+export let pullDockerfileImages = (sortableArrayArg:Dockerfile[],registryArg = "registry.gitlab.com") => {
+    let done = plugins.q.defer();
+    sortableArrayArg.forEach((dockerfileArg) => {
+        dockerfileArg.pull(registryArg);
+    });
+    done.resolve(sortableArrayArg);
+    return done.promise;
+}
+
+export let testDockerfiles = (sortedArrayArg:Dockerfile[]) => {
+    let done = plugins.q.defer();
+    sortedArrayArg.forEach(function(dockerfileArg){
+        dockerfileArg.test();
+    });
+    done.resolve(sortedArrayArg);
+    return done.promise;
+};
+
 export class Dockerfile {
     filePath:string;
     repo:string;
     version:string;
     cleanTag:string;
     buildTag:string;
+    testTag:string;
+    releaseTag:string;
+    containerName:string
     content: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;
+        this.buildTag = this.cleanTag;
+        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));
         };
         this.baseImage = dockerBaseImage(this.content);
+        this.localBaseImageDependent = false;
     };
     build(){
-        if(!this.buildTag){
+        let done = plugins.q.defer();
-            let tag = dockerTag(this.repo,this.version);
+        plugins.beautylog.info("now building Dockerfile for " + this.cleanTag);
-            plugins.shelljs.exec("docker build -t " + tag + " -f " + this.filePath + " .");
+        bashBare("docker build -t " + this.buildTag + " -f " + this.filePath + " .");
-            this.buildTag = tag;
+        NpmciEnv.dockerFilesBuilt.push(this);
-            NpmciEnv.dockerFilesBuilt.push(this);
+        done.resolve();
-        } else {
+        return done.promise;
-            plugins.beautylog.error("This Dockerfile already has been built!");
-        }
-        
     };
-    push(){
+    push(stageArg){
-        if(this.buildTag){
+        let done = plugins.q.defer();
-            plugins.shelljs.exec("docker push " + this.buildTag);
+        let pushTag;
-        } else {
+        switch (stageArg){
-            plugins.beautylog.error("Dockerfile hasn't been built yet!");
+            case "release":
+                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(registryArg:string){
+        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");
+        let testFileExists:boolean = plugins.smartfile.checks.fileExistsSync(testFile);
+        if(testFileExists){
+            bashBare("docker run --name npmci_test_container " + this.buildTag + " mkdir /npmci_test");
+            bashBare("docker cp " + testFile + " npmci_test_container:/npmci_test/test.sh");
+            bashBare("docker commit npmci_test_container npmci_test_image");
+            bashBare("docker run npmci_test_image sh /npmci_test/test.sh");
+            bashBare("docker rm npmci_test_container");
+            bashBare("docker rmi --force npmci_test_image");
+        } else {
+            plugins.beautylog.warn("skipping tests for " + this.cleanTag + " because no testfile was found!");
+        }
+    };
+    getId(){
+        let containerId = bashBare("docker inspect --type=image --format=\"{{.Id}}\" " + this.buildTag);
+        return containerId;
+    };
 }
 
-let dockerFileVersion = function(dockerfileNameArg:string):string{
+export let dockerFileVersion = function(dockerfileNameArg:string):string{
     let versionString:string;
     let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
     let regexResultArray = versionRegex.exec(dockerfileNameArg);
-    if(regexResultArray.length == 2){
+    if(regexResultArray && regexResultArray.length == 2){
         versionString = regexResultArray[1];        
     } else {
         versionString = "latest";
@@ -116,23 +200,30 @@ let dockerFileVersion = function(dockerfileNameArg:string):string{
     return versionString;
 }
 
-let dockerBaseImage = function(dockerfileContentArg:string){
+export let dockerBaseImage = function(dockerfileContentArg:string){
-    let baseImageRegex = /FROM\s([a-zA-z0-9\/\-\:]*)\n/
+    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{
+export let dockerTag = function(registryArg:string,repoArg:string,versionArg:string,suffixArg?:string):string{
     let tagString:string;
-    let registry = NpmciEnv.dockerRegistry;
+    let registry = registryArg;
-    if(process.env.CI_BUILD_STAGE == "test"){
-        registry = "registry.gitlab.com";
-    } 
     let repo = repoArg;
     let version = versionArg;
-    if(process.env.CI_BUILD_STAGE == "test" || process.env.CI_BUILD_STAGE == "build"){
+    if(suffixArg){
-        version = version + "_test";
+        version = versionArg + "_" + suffixArg;
-    }
+    };
     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.command.ts

@@ -0,0 +1,10 @@
+import "typings-global";
+import * as plugins from "./npmci.plugins";
+import {bash} from "./npmci.bash";
+
+export let command = (commandArg) => {
+    let done = plugins.q.defer()
+    console.log(process.argv);
+    done.resolve();
+    return done.promise
+}

ts/npmci.env.ts

@@ -1,13 +1,46 @@
 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 repo:GitRepo;
-export let dockerTestTag:string;
+if(process.env.CI_BUILD_REPO) repo = new GitRepo(process.env.CI_BUILD_REPO);
-export let dockerReleaseTag:string;
 
+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 configStore = () => {
+    let config = {
+        dockerRegistry: dockerRegistry,
+        dockerFilesBuilt: dockerFilesBuilt,
+        dockerFiles: dockerFiles
+    }
+    plugins.smartfile.memory.toFsSync(
+        JSON.stringify(config),
+        {
+            fileName:"config.json",
+            filePath:paths.NpmciPackageRoot
+        }
+    );
+}
+
+export let configLoad = () => {
+    let config;
+    try {
+        config = plugins.smartfile.local.toObjectSync(paths.NpmciPackageConfig,"json");
+    }
+    catch(err){
+        config = {};
+        configStore();
+        plugins.beautylog.log("config initialized!");
+    }
+    
+    config.dockerRegistry ? dockerRegistry = config.dockerRegistry : void(0);
+    config.dockerFilesBuilt ? dockerFilesBuilt = config.dockerFilesBuilt : void(0);
+}
+configLoad();

ts/npmci.paths.ts

@@ -0,0 +1,9 @@
+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");
+export let NpmciProjectDir = cwd;
+export let NpmciTestDir = plugins.path.join(cwd,"./test");

ts/npmci.plugins.ts

@@ -4,6 +4,7 @@ export let commander = require("commander");
 export let gulp = require("gulp");
 export let gulpFunction = require("gulp-function");
 export import path = require("path");
+export import projectinfo = require("projectinfo");
 export let q = require("q");
 export let request = require("request");
 export let shelljs = require("shelljs");

ts/npmci.prepare.ts

@@ -29,6 +29,7 @@ let docker = function(){
         plugins.beautylog.error("You have to specify Login Data to the Docker Registry");
         process.exit(1);
     }
+    plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com"); // Always also login to GitLab Registry
     let dockerRegexResultArray = dockerRegex.exec(process.env.NPMCI_LOGIN_DOCKER);
     let username = dockerRegexResultArray[1];
     let password = dockerRegexResultArray[2];
@@ -40,8 +41,7 @@ let docker = function(){
 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 " + process.env.CI_BUILD_TOKEN + " " + "registry.gitlab.com");
-    plugins.shelljs.exec("docker login -u gitlab-ci-token -p " + ciBuildToken + " " + env.dockerRegistry);
     done.resolve();
     return done.promise;
 }
@@ -51,8 +51,7 @@ export let prepare = function(serviceArg:string){
         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:

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,17 +27,9 @@ let publishNpm  = function(){
 
 let publishDocker = function(){
     let done = plugins.q.defer();
-    NpmciEnv.dockerFilesBuilt.forEach(function(dockerfileArg){
+        NpmciBuildDocker.readDockerfiles()
-        dockerfileArg.push();
+        .then(NpmciBuildDocker.pullDockerfileImages)
-    });
+        .then(NpmciBuildDocker.pushDockerfiles)
+        .then(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;
-}

ts/npmci.test.docker.ts

@@ -0,0 +1,8 @@
+import * as plugins from "./npmci.plugins"
+import * as NpmciEnv from "./npmci.env";
+import {bashBare} from "./npmci.bash";
+import * as NpmciBuildDocker from "./npmci.build.docker";
+
+export let testDocker = () => {
+
+};

ts/npmci.test.ts

@@ -3,6 +3,7 @@ import * as plugins from "./npmci.plugins";
 import {bash} from "./npmci.bash";
 import {install} from "./npmci.install";
 import * as env from "./npmci.env";
+import * as NpmciBuildDocker from "./npmci.build.docker";
 
 export let test = (versionArg) => {
     let done = plugins.q.defer();
@@ -14,10 +15,8 @@ export let test = (versionArg) => {
     } else {
         install(versionArg)
             .then(npmDependencies)
+            .then(npmTest)
             .then(()=>{
-                plugins.beautylog.info("now starting tests:");
-                bash("npm test");
-                plugins.beautylog.success("test finished");
                 done.resolve();
             });
     }
@@ -32,10 +31,20 @@ let npmDependencies = function(){
     return done.promise;
 }
 
-let testDocker = function(){
+let npmTest = () => {
     let done = plugins.q.defer();
-    
+    plugins.beautylog.info("now starting tests:");
+    bash("npm test");
     done.resolve();
     return done.promise;
 }
 
+let testDocker = function(){
+    let done = plugins.q.defer();
+    NpmciBuildDocker.readDockerfiles()
+        .then(NpmciBuildDocker.pullDockerfileImages)
+        .then(NpmciBuildDocker.testDockerfiles)
+        .then(done.resolve)
+    return done.promise;
+}
+