1.2.13

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-dbase:npmts
+image: hosttoday/ht-docker-dbase:npmci
 services:
   - docker:dind
 
@@ -6,23 +6,25 @@ stages:
 - test
 - release
 - trigger
+- pages
 
 test:
   stage: test
   script:
-    - npm install
+    - npmci node install stable
-    - npm test
+    - npmci npm install
+    - npmci npm test
   tags:
     - docker
     - lossless
     - priv
 
 release:
-  image: hosttoday/ht-docker-node:npmts
   stage: release
   environment: npmjs-com_registry
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:
@@ -31,7 +33,6 @@ release:
     - priv
 
 trigger:
-  image: hosttoday/ht-docker-node:npmts
   stage: trigger
   script:
     - npmci trigger
@@ -41,3 +42,18 @@ trigger:
     - docker
     - lossless
     - priv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: pages
+  script:
+    - npmci command yarn global add npmpage
+    - npmci command npmpage
+  only:
+    - tags
+  tags:
+    - docker
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

README.md

@@ -55,5 +55,6 @@ dockersSock | wether or not the testcontainer will have access to the docker.soc
 For further information read the linked docs at the top of this README.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
-[![npm](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)
+[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

assets/Dockerfile

@@ -1,5 +1,6 @@
-FROM hosttoday/ht-docker-node:npmts
+FROM hosttoday/ht-docker-node:npmci
+RUN yarn global add npmdocker
 COPY ./buildContextDir /workspace
 WORKDIR /workspace
 ENV CI=true
-CMD ["npmci","test","stable"];
+CMD ["npmdocker","runinside"];

dist/cli.js

@@ -1,2 +1,3 @@
 #!/usr/bin/env node
+process.env.CLI_CALL = 'true'
 var index = require("../dist/index.js");

dist/index.js

@@ -1,14 +1,5 @@
 "use strict";
-const plugins = require("./npmdocker.plugins");
+Object.defineProperty(exports, "__esModule", { value: true });
-const promisechain = require("./npmdocker.promisechain");
+const cli = require("./npmdocker.cli");
-promisechain.run()
+cli.run();
-    .then((configArg) => {
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLHVDQUFzQztBQUV0QyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUEifQ==
-    if (configArg.exitCode == 0) {
-        plugins.beautylog.success("container ended all right!");
-    }
-    else {
-        plugins.beautylog.error("container ended with error!");
-        process.exit(1);
-    }
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsK0NBQStDO0FBQy9DLHlEQUF5RDtBQUl6RCxZQUFZLENBQUMsR0FBRyxFQUFFO0tBQ2IsSUFBSSxDQUFDLENBQUMsU0FBOEI7SUFDakMsRUFBRSxDQUFBLENBQUMsU0FBUyxDQUFDLFFBQVEsSUFBSSxDQUFDLENBQUMsQ0FBQSxDQUFDO1FBQ3hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsNkJBQTZCLENBQUMsQ0FBQztRQUN2RCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BCLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FBQyJ9

dist/npmdocker.cli.d.ts

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

dist/npmdocker.cli.js

@@ -0,0 +1,79 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./npmdocker.plugins");
+// modules
+const ConfigModule = require("./npmdocker.config");
+const DockerModule = require("./npmdocker.docker");
+/**
+ * smartanalytics
+ * this data is fully anonymized (no Ips or any other personal information is tracked).
+ * It just keeps track which of our tools are really used...
+ * ... so we know where to spend our limited resources for improving them.
+ * Since yarn is out and there is heavy caching going on,
+ * pure download stats are just not reliable enough for us anymore
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * It is just an https call to Google Analytics.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ */
+let npmdockerAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmdocker', 'UA-64087619-5');
+npmdockerAnalytics.sendEvent('npm', 'exec', 'git.zone');
+let npmdockerCli = new plugins.smartcli.Smartcli();
+exports.run = () => {
+    npmdockerCli.standardTask().then((argvArg) => __awaiter(this, void 0, void 0, function* () {
+        plugins.beautylog.figletSync('npmdocker');
+        let configArg = yield ConfigModule.run()
+            .then(DockerModule.run);
+        if (configArg.exitCode === 0) {
+            plugins.beautylog.success('container ended all right!');
+        }
+        else {
+            plugins.beautylog.error(`container ended with error! Exit Code is ${configArg.exitCode}`);
+            process.exit(1);
+        }
+    }));
+    /**
+     * this command is executed inside docker and meant for use from outside docker
+     */
+    npmdockerCli.addCommand('runinside').then((argvArg) => __awaiter(this, void 0, void 0, function* () {
+        plugins.beautylog.ok('Allright. We are now in Docker!');
+        plugins.beautylog.log('now trying to run your specified command');
+        let configArg = yield ConfigModule.run();
+        yield plugins.smartshell.exec(configArg.command).then(response => {
+            if (response.exitCode !== 0) {
+                process.exit(1);
+            }
+        });
+    }));
+    npmdockerCli.addCommand('clean').then((argvArg) => __awaiter(this, void 0, void 0, function* () {
+        plugins.beautylog.ora.start();
+        plugins.beautylog.ora.text('cleaning up docker env...');
+        if (argvArg.all) {
+            plugins.beautylog.ora.text('killing any running docker containers...');
+            yield plugins.smartshell.exec(`docker kill $(docker ps -q)`);
+            plugins.beautylog.ora.text('removing stopped containers...');
+            yield plugins.smartshell.exec(`docker rm $(docker ps -a -q)`);
+            plugins.beautylog.ora.text('removing images...');
+            yield plugins.smartshell.exec(`docker rmi $(docker images -q -f dangling=true)`);
+            plugins.beautylog.ora.text('removing all other images...');
+            yield plugins.smartshell.exec(`docker rmi $(docker images -a -q)`);
+            plugins.beautylog.ora.text('removing all volumes...');
+            yield plugins.smartshell.exec(`docker volume rm $(docker volume ls -f dangling=true -q)`);
+        }
+        plugins.beautylog.ora.endOk('docker environment now is clean!');
+    }));
+    npmdockerCli.addCommand('speedtest').then((argvArg) => __awaiter(this, void 0, void 0, function* () {
+        plugins.beautylog.figletSync('npmdocker');
+        plugins.beautylog.ok('Starting speedtest');
+        yield plugins.smartshell.exec(`docker pull tianon/speedtest && docker run --rm tianon/speedtest`);
+    }));
+    npmdockerCli.startParse();
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUc5QyxVQUFVO0FBQ1YsbURBQWtEO0FBQ2xELG1EQUFrRDtBQUdsRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsSUFBSSxrQkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsV0FBVyxFQUFDLGVBQWUsQ0FBQyxDQUFBO0FBQ2pHLGtCQUFrQixDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUMsTUFBTSxFQUFDLFVBQVUsQ0FBQyxDQUFBO0FBRXJELElBQUksWUFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUV2QyxRQUFBLEdBQUcsR0FBRztJQUNmLFlBQVksQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBTyxPQUFPO1FBQzdDLE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3pDLElBQUksU0FBUyxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRTthQUNyQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3pCLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1FBQ3pELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLDRDQUE0QyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtZQUN6RixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2pCLENBQUM7SUFDSCxDQUFDLENBQUEsQ0FBQyxD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

dist/npmdocker.config.d.ts

@@ -6,4 +6,4 @@ export interface IConfig {
     exitCode?: number;
     keyValueObjectArray: IKeyValueObject[];
 }
-export declare let run: () => Promise<{}>;
+export declare let run: () => Promise<IConfig>;

dist/npmdocker.config.js

@@ -1,9 +1,17 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmdocker.plugins");
 const paths = require("./npmdocker.paths");
 ;
-let getQenvKeyValueObject = () => {
+let getQenvKeyValueObject = () => __awaiter(this, void 0, void 0, function* () {
-    let done = plugins.q.defer();
     let qenvKeyValueObjectArray;
     if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
         qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray;
@@ -12,26 +20,20 @@ let getQenvKeyValueObject = () => {
         qenvKeyValueObjectArray = [];
     }
     ;
-    done.resolve(qenvKeyValueObjectArray);
+    return qenvKeyValueObjectArray;
-    return done.promise;
+});
-};
+let buildConfig = (qenvKeyValueObjectArrayArg) => __awaiter(this, void 0, void 0, function* () {
-let buildConfig = (qenvKeyValueObjectArrayArg) => {
-    let done = plugins.q.defer();
     let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
     let config = npmextra.dataFor('npmdocker', {
-        baseImage: 'hosttoday/ht-docker-node:npmts',
+        baseImage: 'hosttoday/ht-docker-node:npmci',
-        command: 'npm test',
+        command: 'npmci test stable',
         dockerSock: false,
         keyValueObjectArray: qenvKeyValueObjectArrayArg
     });
-    done.resolve(config);
+    return config;
-    return done.promise;
+});
-};
+exports.run = () => __awaiter(this, void 0, void 0, function* () {
-exports.run = () => {
+    let config = yield getQenvKeyValueObject().then(buildConfig);
-    let done = plugins.q.defer();
+    return config;
-    getQenvKeyValueObject()
+});
-        .then(buildConfig)
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUc7SUFDMUIsSUFBSSx1QkFBMEMsQ0FBQTtJQUM5QyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsRix1QkFBdUIsR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUMsbUJBQW1CLENBQUE7SUFDM0YsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sdUJBQXVCLEdBQUcsRUFBRSxDQUFBO0lBQzlCLENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFDLHVCQUF1QixDQUFBO0FBQ2hDLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBTywwQkFBNkM7SUFDcEUsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDdkQsSUFBSSxNQUFNLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FDM0IsV0FBVyxFQUNYO1FBQ0UsU0FBUyxFQUFFLGdDQUFnQztRQUMzQyxPQUFPLEVBQUUsbUJBQW1CO1FBQzVCLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLG1CQUFtQixFQUFFLDBCQUEwQjtLQUNoRCxDQUNGLENBQUE7SUFDRCxNQUFNLENBQUMsTUFBTSxDQUFBO0FBQ2YsQ0FBQyxDQUFBLENBQUE7QUFFVSxRQUFBLEdBQUcsR0FBRztJQUNmLElBQUksTUFBTSxHQUFHLE1BQU0scUJBQXFCLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDNUQsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSxDQUFBIn0=
-        .then(done.resolve);
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUc7SUFDMUIsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLHVCQUEwQyxDQUFBO0lBQzlDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2xGLHVCQUF1QixHQUFHLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxTQUFTLENBQUMsQ0FBQyxtQkFBbUIsQ0FBQTtJQUMzRixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTix1QkFBdUIsR0FBRyxFQUFFLENBQUE7SUFDOUIsQ0FBQztJQUFBLENBQUM7SUFDRixJQUFJLENBQUMsT0FBTyxDQUFDLHVCQUF1QixDQUFDLENBQUE7SUFDckMsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDckIsQ0FBQyxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBQywwQkFBMkM7SUFDNUQsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixJQUFJLFFBQVEsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUN2RCxJQUFJLE1BQU0sR0FBRyxRQUFRLENBQUMsT0FBTyxDQUMzQixXQUFXLEVBQ1g7UUFDRSxTQUFTLEVBQUUsZ0NBQWdDO1FBQzNDLE9BQU8sRUFBRSxVQUFVO1FBQ25CLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLG1CQUFtQixFQUFFLDBCQUEwQjtLQUNoRCxDQUNGLENBQUE7SUFDRCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3BCLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0FBQ3JCLENBQUMsQ0FBQTtBQUVVLFFBQUEsR0FBRyxHQUFHO0lBQ2YsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM1QixxQkFBcUIsRUFBRTtTQUNwQixJQUFJLENBQUMsV0FBVyxDQUFDO1NBQ2pCLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDckIsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7QUFDckIsQ0FBQyxDQUFBIn0=

dist/npmdocker.docker.d.ts

@@ -1 +1,2 @@
-export declare let run: (configArg: any) => Promise<{}>;
+import { IConfig } from './npmdocker.config';
+export declare let run: (configArg: IConfig) => Promise<IConfig>;

dist/npmdocker.paths.js

@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmdocker.plugins");
 // directories
 exports.cwd = process.cwd();
@@ -9,4 +10,4 @@ exports.buildContextDir = plugins.path.join(exports.assets, "buildContextDir");
 plugins.smartfile.fs.ensureDirSync(exports.buildContextDir);
 // files
 exports.dockerfile = plugins.path.join(exports.assets, "Dockerfile");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwrQ0FBK0M7QUFFL0MsY0FBYztBQUNILFFBQUEsR0FBRyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUNwQixRQUFBLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7QUFDbEQsUUFBQSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsbUJBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztBQUM5RCxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMsY0FBTSxDQUFDLENBQUM7QUFFaEMsUUFBQSxlQUFlLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBTSxFQUFDLGlCQUFpQixDQUFDLENBQUM7QUFDekUsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLHVCQUFlLENBQUMsQ0FBQztBQUVwRCxRQUFRO0FBQ0csUUFBQSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBTSxFQUFFLFlBQVksQ0FBQyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBRS9DLGNBQWM7QUFDSCxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDcEIsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2xELFFBQUEsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFXLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLGNBQU0sQ0FBQyxDQUFDO0FBRWhDLFFBQUEsZUFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBQyxpQkFBaUIsQ0FBQyxDQUFDO0FBQ3pFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyx1QkFBZSxDQUFDLENBQUM7QUFFcEQsUUFBUTtBQUNHLFFBQUEsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBRSxZQUFZLENBQUMsQ0FBQyJ9

dist/npmdocker.plugins.d.ts

@@ -1,10 +1,13 @@
-import "typings-global";
+import 'typings-global';
-export import beautylog = require("beautylog");
+import * as beautylog from 'beautylog';
-export import npmextra = require("npmextra");
+import * as npmextra from 'npmextra';
-export import path = require("path");
+import * as path from 'path';
-export import projectinfo = require("projectinfo");
+import * as projectinfo from 'projectinfo';
-export import q = require("smartq");
+import * as q from 'smartq';
-export import qenv = require("qenv");
+import * as qenv from 'qenv';
-export import shelljs = require("shelljs");
+import * as smartanalytics from 'smartanalytics';
-export import smartfile = require("smartfile");
+import * as smartcli from 'smartcli';
-export import smartstring = require("smartstring");
+import * as smartfile from 'smartfile';
+import * as smartshell from 'smartshell';
+import * as smartstring from 'smartstring';
+export { beautylog, npmextra, path, projectinfo, q, qenv, smartanalytics, smartcli, smartfile, smartshell, smartstring };

dist/npmdocker.plugins.js

@@ -1,12 +1,26 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
-exports.beautylog = require("beautylog");
+const beautylog = require("beautylog");
-exports.npmextra = require("npmextra");
+exports.beautylog = beautylog;
-exports.path = require("path");
+const npmextra = require("npmextra");
-exports.projectinfo = require("projectinfo");
+exports.npmextra = npmextra;
-exports.q = require("smartq");
+const path = require("path");
-exports.qenv = require("qenv");
+exports.path = path;
-exports.shelljs = require("shelljs");
+const projectinfo = require("projectinfo");
-exports.smartfile = require("smartfile");
+exports.projectinfo = projectinfo;
-exports.smartstring = require("smartstring");
+const q = require("smartq");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1kb2NrZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ3hCLHlDQUErQztBQUMvQyx1Q0FBNkM7QUFDN0MsK0JBQXFDO0FBQ3JDLDZDQUFtRDtBQUNuRCw4QkFBb0M7QUFDcEMsK0JBQXFDO0FBQ3JDLHFDQUEyQztBQUMzQyx5Q0FBK0M7QUFDL0MsNkNBQW1EIn0=
+exports.q = q;
+const qenv = require("qenv");
+exports.qenv = qenv;
+const smartanalytics = require("smartanalytics");
+exports.smartanalytics = smartanalytics;
+const smartcli = require("smartcli");
+exports.smartcli = smartcli;
+const smartfile = require("smartfile");
+exports.smartfile = smartfile;
+const smartshell = require("smartshell");
+exports.smartshell = smartshell;
+const smartstring = require("smartstring");
+exports.smartstring = smartstring;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1kb2NrZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2Qix1Q0FBc0M7QUFhcEMsOEJBQVM7QUFaWCxxQ0FBb0M7QUFhbEMsNEJBQVE7QUFaViw2QkFBNEI7QUFhMUIsb0JBQUk7QUFaTiwyQ0FBMEM7QUFheEMsa0NBQVc7QUFaYiw0QkFBMkI7QUFhekIsY0FBQztBQVpILDZCQUE0QjtBQWExQixvQkFBSTtBQVpOLGlEQUFnRDtBQWE5Qyx3Q0FBYztBQVpoQixxQ0FBb0M7QUFhbEMsNEJBQVE7QUFaVix1Q0FBc0M7QUFhcEMsOEJBQVM7QUFaWCx5Q0FBd0M7QUFhdEMsZ0NBQVU7QUFaWiwyQ0FBMEM7QUFheEMsa0NBQVcifQ==

dist/npmdocker.promisechain.d.ts

@@ -1 +0,0 @@
-export declare let run: () => Promise<{}>;

dist/npmdocker.promisechain.js

@@ -1,16 +0,0 @@
-"use strict";
-const plugins = require("./npmdocker.plugins");
-//modules
-const ConfigModule = require("./npmdocker.config");
-const DockerModule = require("./npmdocker.docker");
-plugins.beautylog.ora.start();
-exports.run = () => {
-    let done = plugins.q.defer();
-    ConfigModule.run()
-        .then(DockerModule.run)
-        .then((configArg) => {
-        done.resolve(configArg);
-    });
-    return done.promise;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnByb21pc2VjaGFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5wcm9taXNlY2hhaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtDQUErQztBQUcvQyxTQUFTO0FBQ1QsbURBQW1EO0FBQ25ELG1EQUFtRDtBQUVuRCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNuQixRQUFBLEdBQUcsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsWUFBWSxDQUFDLEdBQUcsRUFBRTtTQUNiLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDO1NBQ3RCLElBQUksQ0FBQyxDQUFDLFNBQVM7UUFDWixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFBO0lBQ04sTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIn0=

dist/npmdocker.snippets.js

@@ -1,21 +1,14 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmdocker.plugins");
 exports.dockerfileSnippet = (optionsArg) => {
-    let commandArray = optionsArg.command.split(/\s/);
-    let commandString = "";
-    for (let stringItem of commandArray) {
-        if (!(commandString == "")) {
-            commandString = commandString + ",";
-        }
-        commandString = commandString + '"' + stringItem + '"';
-    }
-    ;
     return plugins.smartstring.indent.normalize(`
         FROM ${optionsArg.baseImage}
+        RUN yarn global add npmdocker
         COPY ./buildContextDir /workspace
         WORKDIR /workspace
         ENV CI=true
-        CMD [${commandString}];
+        CMD ["npmdocker","runinside"];
     `);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSwrQ0FBK0M7QUFPcEMsUUFBQSxpQkFBaUIsR0FBRyxDQUFDLFVBQTZCO0lBQ3pELElBQUksWUFBWSxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2xELElBQUksYUFBYSxHQUFVLEVBQUUsQ0FBQztJQUM5QixHQUFHLENBQUEsQ0FBQyxJQUFJLFVBQVUsSUFBSSxZQUFZLENBQUMsQ0FBQSxDQUFDO1FBQ2hDLEVBQUUsQ0FBQSxDQUFDLENBQUMsQ0FBQyxhQUFhLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQSxDQUFDO1lBQ3ZCLGFBQWEsR0FBRyxhQUFhLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7UUFDRCxhQUFhLEdBQUcsYUFBYSxHQUFHLEdBQUcsR0FBRyxVQUFVLEdBQUcsR0FBRyxDQUFDO0lBQzNELENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztlQUNqQyxVQUFVLENBQUMsU0FBUzs7OztlQUlwQixhQUFhO0tBQ3ZCLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBT3BDLFFBQUEsaUJBQWlCLEdBQUcsQ0FBQyxVQUE4QjtJQUM1RCxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO2VBQy9CLFVBQVUsQ0FBQyxTQUFTOzs7Ozs7S0FNOUIsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBIn0=

docs/index.md

@@ -0,0 +1 @@
+Docs for npmpage coming soon.

npmextra.json

@@ -3,5 +3,10 @@
         "mode":"default",
         "cli":true,
         "dockerSock":true
+    },
+    "npmci": {
+        "globalNpmTools": [
+            "npmts"
+        ]
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmdocker",
-  "version": "1.2.2",
+  "version": "1.2.13",
   "description": "develop npm modules cross platform with docker",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -11,12 +11,13 @@
     "test": "test"
   },
   "scripts": {
-    "test": "(npm run clean && npm run compile && npm run setupCheck && npm run check)",
+    "test": "(npm run clean && npm run compile && npm run setupCheck && npm run testStandard && npm run testSpeed && npm run testClean)",
-    "testDev": "(npm run compile && npm run check)",
+    "testStandard": "(cd test/ && node ../dist/index.js)",
+    "testSpeed": "(cd test/ && node ../dist/index.js speedtest)",
+    "testClean": "(cd test/ && node ../dist/index.js clean --all)",
     "clean": "(rm -rf test/)",
     "compile": "(npmts --notest)",
-    "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
+    "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)"
-    "check": "(cd test/ && node ../dist/index.js)"
   },
   "repository": {
     "type": "git",
@@ -31,19 +32,19 @@
     "url": "https://gitlab.com/gitzone/npmdocker/issues"
   },
   "homepage": "https://gitlab.com/gitzone/npmdocker#README",
-  "devDependencies": {
+  "devDependencies": {},
-    "npmts-g": "^6.0.0"
-  },
   "dependencies": {
     "@types/shelljs": "0.x.x",
-    "beautylog": "^6.1.1",
+    "beautylog": "^6.1.10",
-    "npmextra": "^2.0.3",
+    "npmextra": "^2.0.9",
-    "projectinfo": "^3.0.1",
+    "projectinfo": "^3.0.4",
-    "qenv": "^1.1.3",
+    "qenv": "^1.1.7",
-    "shelljs": "^0.7.6",
+    "smartanalytics": "^2.0.9",
-    "smartfile": "^4.1.5",
+    "smartcli": "^2.0.7",
-    "smartq": "^1.1.0",
+    "smartfile": "^4.2.26",
-    "smartstring": "^2.0.22",
+    "smartq": "^1.1.6",
-    "typings-global": "^1.0.14"
+    "smartshell": "^1.0.18",
+    "smartstring": "^2.0.24",
+    "typings-global": "^1.0.20"
   }
 }

ts/index.ts

@@ -1,15 +1,4 @@
-import * as plugins from "./npmdocker.plugins";
+import * as plugins from './npmdocker.plugins'
-import * as promisechain from "./npmdocker.promisechain";
+import * as cli from './npmdocker.cli'
-import * as ConfigModule from "./npmdocker.config";
-
-
-promisechain.run()
-    .then((configArg:ConfigModule.IConfig) => {
-        if(configArg.exitCode == 0){
-            plugins.beautylog.success("container ended all right!");
-        } else {
-            plugins.beautylog.error("container ended with error!");
-            process.exit(1);
-        }
-    });
 
+cli.run()

ts/npmdocker.cli.ts

@@ -0,0 +1,81 @@
+import * as plugins from './npmdocker.plugins'
+import * as paths from './npmdocker.paths'
+
+// modules
+import * as ConfigModule from './npmdocker.config'
+import * as DockerModule from './npmdocker.docker'
+
+
+/**
+ * smartanalytics
+ * this data is fully anonymized (no Ips or any other personal information is tracked).
+ * It just keeps track which of our tools are really used...
+ * ... so we know where to spend our limited resources for improving them.
+ * Since yarn is out and there is heavy caching going on,
+ * pure download stats are just not reliable enough for us anymore
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * It is just an https call to Google Analytics.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ */
+let npmdockerAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmdocker','UA-64087619-5')
+npmdockerAnalytics.sendEvent('npm','exec','git.zone')
+
+let npmdockerCli = new plugins.smartcli.Smartcli()
+
+export let run = () => {
+  npmdockerCli.standardTask().then(async (argvArg) => {
+    plugins.beautylog.figletSync('npmdocker')
+    let configArg = await ConfigModule.run()
+      .then(DockerModule.run)
+    if (configArg.exitCode === 0) {
+      plugins.beautylog.success('container ended all right!')
+    } else {
+      plugins.beautylog.error(`container ended with error! Exit Code is ${configArg.exitCode}`)
+      process.exit(1)
+    }
+  })
+
+  /**
+   * this command is executed inside docker and meant for use from outside docker
+   */
+  npmdockerCli.addCommand('runinside').then(async (argvArg) => {
+    plugins.beautylog.ok('Allright. We are now in Docker!')
+    plugins.beautylog.log('now trying to run your specified command')
+    let configArg = await ConfigModule.run()
+    await plugins.smartshell.exec(configArg.command).then(response => {
+      if (response.exitCode !== 0) {
+        process.exit(1)
+      }
+    })
+  })
+
+  npmdockerCli.addCommand('clean').then(async (argvArg) => {
+    plugins.beautylog.ora.start()
+    plugins.beautylog.ora.text('cleaning up docker env...')
+    if (argvArg.all) {
+      plugins.beautylog.ora.text('killing any running docker containers...')
+      await plugins.smartshell.exec(`docker kill $(docker ps -q)`)
+
+      plugins.beautylog.ora.text('removing stopped containers...')
+      await plugins.smartshell.exec(`docker rm $(docker ps -a -q)`)
+
+      plugins.beautylog.ora.text('removing images...')
+      await plugins.smartshell.exec(`docker rmi $(docker images -q -f dangling=true)`)
+
+      plugins.beautylog.ora.text('removing all other images...')
+      await plugins.smartshell.exec(`docker rmi $(docker images -a -q)`)
+
+      plugins.beautylog.ora.text('removing all volumes...')
+      await plugins.smartshell.exec(`docker volume rm $(docker volume ls -f dangling=true -q)`)
+    }
+    plugins.beautylog.ora.endOk('docker environment now is clean!')
+  })
+
+  npmdockerCli.addCommand('speedtest').then(async (argvArg) => {
+    plugins.beautylog.figletSync('npmdocker')
+    plugins.beautylog.ok('Starting speedtest')
+    await plugins.smartshell.exec(`docker pull tianon/speedtest && docker run --rm tianon/speedtest`)
+  })
+
+  npmdockerCli.startParse()
+}

ts/npmdocker.config.ts

@@ -12,38 +12,31 @@ export interface IConfig {
   keyValueObjectArray: IKeyValueObject[]
 };
 
-let getQenvKeyValueObject = () => {
+let getQenvKeyValueObject = async () => {
-  let done = plugins.q.defer()
   let qenvKeyValueObjectArray: IKeyValueObject[]
   if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
     qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray
   } else {
     qenvKeyValueObjectArray = []
   };
-  done.resolve(qenvKeyValueObjectArray)
+  return qenvKeyValueObjectArray
-  return done.promise
 }
 
-let buildConfig = (qenvKeyValueObjectArrayArg: IKeyValueObject) => {
+let buildConfig = async (qenvKeyValueObjectArrayArg: IKeyValueObject[]) => {
-  let done = plugins.q.defer()
   let npmextra = new plugins.npmextra.Npmextra(paths.cwd)
   let config = npmextra.dataFor<IConfig>(
     'npmdocker',
     {
-      baseImage: 'hosttoday/ht-docker-node:npmts',
+      baseImage: 'hosttoday/ht-docker-node:npmci',
-      command: 'npm test',
+      command: 'npmci test stable',
       dockerSock: false,
       keyValueObjectArray: qenvKeyValueObjectArrayArg
     }
   )
-  done.resolve(config)
+  return config
-  return done.promise
 }
 
-export let run = () => {
+export let run = async (): Promise<IConfig> => {
-  let done = plugins.q.defer()
+  let config = await getQenvKeyValueObject().then(buildConfig)
-  getQenvKeyValueObject()
+  return config
-    .then(buildConfig)
+}
-    .then(done.resolve)
-  return done.promise
-}

ts/npmdocker.docker.ts

@@ -24,7 +24,7 @@ let dockerData = {
 let checkDocker = () => {
   let done = plugins.q.defer()
   plugins.beautylog.ora.text('checking docker...')
-  if (plugins.shelljs.which('docker')) {
+  if (plugins.smartshell.which('docker')) {
     plugins.beautylog.ok('Docker found!')
     done.resolve()
   } else {
@@ -54,145 +54,112 @@ let buildDockerFile = () => {
 /**
  * builds the Dockerimage from the built Dockerfile
  */
-let buildDockerImage = () => {
+let buildDockerImage = async () => {
-  let done = plugins.q.defer()
   plugins.beautylog.ora.text('pulling latest base image from registry...')
-  plugins.shelljs.exec(
+  await plugins.smartshell.execSilent(
-    `docker pull ${config.baseImage}`,
+    `docker pull ${config.baseImage}`
-    {
+  ).then(async () => {
-      silent: true
+    plugins.beautylog.ora.text('building Dockerimage...')
-    },
+    // are we creating a build context form project ?
-    () => {
+    if (process.env.CI === 'true') {
-      plugins.beautylog.ora.text('building Dockerimage...')
+      plugins.beautylog.ora.text('creating build context...')
-      // are we creating a build context form project ?
+      plugins.smartfile.fs.copySync(paths.cwd, paths.buildContextDir)
-      if (process.env.CI === 'true') {
-        plugins.beautylog.ora.text('creating build context...')
-        plugins.smartfile.fs.copySync(paths.cwd, paths.buildContextDir)
-      }
-      plugins.shelljs.exec(
-        `docker build -f ${paths.dockerfile} -t ${dockerData.imageTag} ${paths.assets}`,
-        {
-          silent: true
-        },
-        () => {
-          plugins.beautylog.ok('Dockerimage built!')
-          done.resolve()
-        }
-      )
     }
-  ) // first pull latest version of baseImage
+    await plugins.smartshell.execSilent(
-  return done.promise
+      `docker build -f ${paths.dockerfile} -t ${dockerData.imageTag} ${paths.assets}`
+    ).then(async (response) => {
+      if (response.exitCode !== 0) {
+        console.log(response.stdout)
+        process.exit(1)
+      }
+      plugins.beautylog.ok('Dockerimage built!')
+    })
+  })
 }
 
-let buildDockerProjectMountString = () => {
+let buildDockerProjectMountString = async () => {
-  let done = plugins.q.defer()
   if (process.env.CI !== 'true') {
     dockerData.dockerProjectMountString = `-v ${paths.cwd}:/workspace`
   };
-  done.resolve()
-  return done.promise
 }
 
 /**
  * builds an environment string that docker cli understands
  */
-let buildDockerEnvString = () => {
+let buildDockerEnvString = async () => {
-  let done = plugins.q.defer()
   for (let keyValueObjectArg of config.keyValueObjectArray) {
     let envString = dockerData.dockerEnvString = dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `
   };
-  done.resolve()
-  return done.promise
 }
 
 /**
  * creates string to mount the docker.sock inside the testcontainer
  */
-let buildDockerSockString = () => {
+let buildDockerSockString = async () => {
-  let done = plugins.q.defer()
   if (config.dockerSock) {
     dockerData.dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`
   };
-  done.resolve()
-  return done
 }
 
 /**
  * creates a container by running the built Dockerimage
  */
-let runDockerImage = () => {
+let runDockerImage = async () => {
   let done = plugins.q.defer()
   plugins.beautylog.ora.text('starting Container...')
   plugins.beautylog.ora.end()
   plugins.beautylog.log('now running Dockerimage')
-  config.exitCode = plugins.shelljs.exec(`docker run ${dockerData.dockerProjectMountString} ${dockerData.dockerSockString} ${dockerData.dockerEnvString} --name ${dockerData.containerName} ${dockerData.imageTag}`).code
+  config.exitCode = (await plugins.smartshell.exec(`docker run ${dockerData.dockerProjectMountString} ${dockerData.dockerSockString} ${dockerData.dockerEnvString} --name ${dockerData.containerName} ${dockerData.imageTag}`)).exitCode
-  done.resolve()
-  return done.promise
 }
 
 /**
  * cleans up: deletes the test container
  */
-let deleteDockerContainer = () => {
+let deleteDockerContainer = async () => {
-  let done = plugins.q.defer()
+  await plugins.smartshell.execSilent(`docker rm -f ${dockerData.containerName}`)
-  plugins.shelljs.exec(`docker rm -f ${dockerData.containerName}`, {
-    silent: true
-  })
-  done.resolve()
-  return done.promise
 }
 
 /**
  * cleans up deletes the test image
  */
-let deleteDockerImage = () => {
+let deleteDockerImage = async () => {
-  let done = plugins.q.defer()
+  await plugins.smartshell.execSilent(`docker rmi ${dockerData.imageTag}`).then(async (response) => {
-  plugins.shelljs.exec(`docker rmi ${dockerData.imageTag}`, {
+    if (response.exitCode !== 0) {
-    silent: true
+      console.log(response.stdout)
+    }
   })
-  done.resolve()
-  return done.promise
 }
 
 /**
  * cleans up, deletes the build context
  */
-let deleteBuildContext = () => {
+let deleteBuildContext = async () => {
-  let done = plugins.q.defer()
+  await plugins.smartfile.fs.remove(paths.buildContextDir)
-  plugins.smartfile.fs.remove(paths.buildContextDir)
-    .then(() => {
-      done.resolve()
-    })
-  return done.promise
 }
 
-let preClean = () => {
+let preClean = async () => {
-  let done = plugins.q.defer()
+  await deleteDockerImage()
-  deleteDockerImage()
     .then(deleteDockerContainer)
-    .then(() => {
+    .then(async () => {
       plugins.beautylog.ok('ensured clean Docker environment!')
-      done.resolve()
     })
 }
 
-let postClean = () => {
+let postClean = async () => {
-  let done = plugins.q.defer()
+  await deleteDockerContainer()
-  deleteDockerContainer()
     .then(deleteDockerImage)
     .then(deleteBuildContext)
-    .then(() => {
+    .then(async () => {
       plugins.beautylog.ok('cleaned up!')
-      done.resolve()
     })
 }
 
 
 
-export let run = (configArg) => {
+export let run = async (configArg: IConfig): Promise<IConfig> => {
-  let done = plugins.q.defer()
+  plugins.beautylog.ora.start()
   config = configArg
-  checkDocker()
+  let resultConfig = await checkDocker()
     .then(preClean)
     .then(buildDockerFile)
     .then(buildDockerImage)
@@ -201,8 +168,6 @@ export let run = (configArg) => {
     .then(buildDockerSockString)
     .then(runDockerImage)
     .then(postClean)
-    .then(() => {
+    .catch(err => { console.log(err) })
-      done.resolve(config);
+  return config
-    }).catch(err => { console.log(err) })
+}
-  return done.promise
-}

ts/npmdocker.plugins.ts

@@ -1,10 +1,26 @@
-import "typings-global";
+import 'typings-global'
-export import beautylog = require("beautylog");
+import * as beautylog from 'beautylog'
-export import npmextra = require("npmextra");
+import * as npmextra from 'npmextra'
-export import path = require("path");
+import * as path from 'path'
-export import projectinfo = require("projectinfo");
+import * as projectinfo from 'projectinfo'
-export import q = require("smartq");
+import * as q from 'smartq'
-export import qenv = require("qenv");
+import * as qenv from 'qenv'
-export import shelljs = require("shelljs");
+import * as smartanalytics from 'smartanalytics'
-export import smartfile = require("smartfile");
+import * as smartcli from 'smartcli'
-export import smartstring = require("smartstring");
+import * as smartfile from 'smartfile'
+import * as smartshell from 'smartshell'
+import * as smartstring from 'smartstring'
+
+export {
+  beautylog,
+  npmextra,
+  path,
+  projectinfo,
+  q,
+  qenv,
+  smartanalytics,
+  smartcli,
+  smartfile,
+  smartshell,
+  smartstring
+}

ts/npmdocker.promisechain.ts

@@ -1,17 +0,0 @@
-import * as plugins from "./npmdocker.plugins";
-import * as paths from "./npmdocker.paths";
-
-//modules
-import * as ConfigModule from "./npmdocker.config";
-import * as DockerModule from "./npmdocker.docker";
-
-plugins.beautylog.ora.start();
-export let run = () => {
-    let done = plugins.q.defer();
-    ConfigModule.run()
-        .then(DockerModule.run)
-        .then((configArg) => {
-            done.resolve(configArg);
-        })
-    return done.promise;
-}

ts/npmdocker.snippets.ts

@@ -1,24 +1,17 @@
 import * as plugins from "./npmdocker.plugins";
 
 export interface IDockerfileSnippet {
-    baseImage:string;
+  baseImage: string;
-    command:string;
+  command: string;
 }
 
-export let dockerfileSnippet = (optionsArg:IDockerfileSnippet):string => {
+export let dockerfileSnippet = (optionsArg: IDockerfileSnippet): string => {
-    let commandArray = optionsArg.command.split(/\s/);
+  return plugins.smartstring.indent.normalize(`
-    let commandString:string = "";
-    for(let stringItem of commandArray){
-        if(!(commandString == "")){
-            commandString = commandString + ",";
-        }
-        commandString = commandString + '"' + stringItem + '"';
-    };
-    return plugins.smartstring.indent.normalize(`
         FROM ${optionsArg.baseImage}
+        RUN yarn global add npmdocker
         COPY ./buildContextDir /workspace
         WORKDIR /workspace
         ENV CI=true
-        CMD [${commandString}];
+        CMD ["npmdocker","runinside"];
-    `);
+    `)
 }