1.2.24

.gitlab-ci.yml

@@ -3,11 +3,21 @@ services:
   - docker:dind
 
 stages:
+- mirror
 - test
 - release
 - trigger
 - pages
 
+mirror:
+  image: hosttoday/ht-docker-node:npmci
+  stage: mirror
+  script:
+    - npmci git mirror
+  tags:
+    - docker
+
+
 test:
   stage: test
   script:

Dockerfile

@@ -0,0 +1,4 @@
+FROM hosttoday/ht-docker-node:stable
+LABEL author="Lossless GmbH <office@lossless.com>"
+
+RUN yarn global add npmci npmdocker npmts ts-node

README.md

@@ -1,13 +1,16 @@
 # npmdocker
+
 develop npm modules cross platform with docker
 
 ## Availabililty
+
 [![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmdocker)
 [![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmdocker)
 [![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmdocker)
 [![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmdocker/)
 
 ## Status for master
+
 [![build status](https://GitLab.com/gitzone/npmdocker/badges/master/build.svg)](https://GitLab.com/gitzone/npmdocker/commits/master)
 [![coverage report](https://GitLab.com/gitzone/npmdocker/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmdocker/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/npmdocker.svg)](https://www.npmjs.com/package/npmdocker)
@@ -19,21 +22,25 @@ develop npm modules cross platform with docker
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
+
 Use TypeScript for best in class instellisense.
 
 ### Why does this package exist?
+
 Sometimes you want a clean and fresh linux environment everytime you test your package.
 Usually this is the default i CI, but locally behaviour tends to defer.
 
 ### Where does it work
+
 The npmdocker package works in everywhere where the docker cli is available. e.g.:
 
-  * docker toolbox
-  * native docker application
-  * docker in docker
-  * mounted docker.sock
+* docker toolbox
+* native docker application
+* docker in docker
+* mounted docker.sock
 
 ### How do I use it?
+
 create a npmextra.json in the project's root directory
 
 ```json
@@ -46,15 +53,15 @@ create a npmextra.json in the project's root directory
 }
 ```
 
-option | description
---- | ---
-baseImage | the base image that is the context for your project
-command | the cli command to run within the the project's directory inside the docker container
-dockersSock | wether or not the testcontainer will have access to the docker.sock of the host
+| option      | description                                                                           |
+| ----------- | ------------------------------------------------------------------------------------- |
+| baseImage   | the base image that is the context for your project                                   |
+| command     | the cli command to run within the the project's directory inside the docker container |
+| dockersSock | wether or not the testcontainer will have access to the docker.sock of the host       |
 
 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)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
 [![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

assets/Dockerfile

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

cli.js

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

cli.ts.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+process.env.CLI_CALL = 'true';
+require('@gitzone/tsrun');
+require('./ts/index');

dist/cli.js

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

dist/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const cli = require("./npmdocker.cli");
-cli.run();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLHVDQUFzQztBQUV0QyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUEifQ==

dist/npmdocker.cli.d.ts

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

dist/npmdocker.cli.js

@@ -1,79 +0,0 @@
-"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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUc5QyxVQUFVO0FBQ1YsbURBQWtEO0FBQ2xELG1EQUFrRDtBQUdsRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsSUFBSSxrQkFBa0IsR0FBRyxJQUFJLE9BQU8sQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsV0FBVyxFQUFDLGVBQWUsQ0FBQyxDQUFBO0FBQ2pHLGtCQUFrQixDQUFDLFNBQVMsQ0FBQyxLQUFLLEVBQUMsTUFBTSxFQUFDLFVBQVUsQ0FBQyxDQUFBO0FBRXJELElBQUksWUFBWSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUV2QyxRQUFBLEdBQUcsR0FBRztJQUNmLFlBQVksQ0FBQyxZQUFZLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBTyxPQUFPO1FBQzdDLE9BQU8sQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFBO1FBQ3pDLElBQUksU0FBUyxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRTthQUNyQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ3pCLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQUFBO1FBQ3pELENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLDRDQUE0QyxTQUFTLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtZQUN6RixPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ2pCLENBQUM7SUFDSCxDQUFDLENBQUEsQ0FBQyxDQUFBO0lBRUY7O09BRUc7SUFDSCxZQUFZLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFPLE9BQU87UUFDdEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsaUNBQWlDLENBQUMsQ0FBQTtRQUN2RCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQywwQ0FBMEMsQ0FBQyxDQUFBO1FBQ2pFLElBQUksU0FBUyxHQUFHLE1BQU0sWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQ3hDLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRO1lBQzVELEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDNUIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtZQUNqQixDQUFDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUEsQ0FBQyxDQUFBO0lBRUYsWUFBWSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBTyxPQUFPO1FBQ2xELE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzdCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxDQUFBO1FBQ3ZELEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2hCLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQywwQ0FBMEMsQ0FBQyxDQUFBO1lBQ3RFLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsQ0FBQTtZQUU1RCxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQTtZQUM1RCxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLENBQUE7WUFFN0QsT0FBTyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUE7WUFDaEQsTUFBTSxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxpREFBaUQsQ0FBQyxDQUFBO1lBRWhGLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxDQUFBO1lBQzFELE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsbUNBQW1DLENBQUMsQ0FBQTtZQUVsRSxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMseUJBQXlCLENBQUMsQ0FBQTtZQUNyRCxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLDBEQUEwRCxDQUFDLENBQUE7UUFDM0YsQ0FBQztRQUNELE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFBO0lBQ2pFLENBQUMsQ0FBQSxDQUFDLENBQUE7SUFFRixZQUFZLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFPLE9BQU87UUFDdEQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLENBQUE7UUFDekMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtRQUMxQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLGtFQUFrRSxDQUFDLENBQUE7SUFDbkcsQ0FBQyxDQUFBLENBQUMsQ0FBQTtJQUVGLFlBQVksQ0FBQyxVQUFVLEVBQUUsQ0FBQTtBQUMzQixDQUFDLENBQUEifQ==

dist/npmdocker.config.d.ts

@@ -1,9 +0,0 @@
-import { IKeyValueObject } from 'qenv';
-export interface IConfig {
-    baseImage: string;
-    command: string;
-    dockerSock: boolean;
-    exitCode?: number;
-    keyValueObjectArray: IKeyValueObject[];
-}
-export declare let run: () => Promise<IConfig>;

dist/npmdocker.config.js

@@ -1,39 +0,0 @@
-"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 = () => __awaiter(this, void 0, void 0, function* () {
-    let qenvKeyValueObjectArray;
-    if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
-        qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray;
-    }
-    else {
-        qenvKeyValueObjectArray = [];
-    }
-    ;
-    return qenvKeyValueObjectArray;
-});
-let buildConfig = (qenvKeyValueObjectArrayArg) => __awaiter(this, void 0, void 0, function* () {
-    let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
-    let config = npmextra.dataFor('npmdocker', {
-        baseImage: 'hosttoday/ht-docker-node:npmci',
-        command: 'npmci test stable',
-        dockerSock: false,
-        keyValueObjectArray: qenvKeyValueObjectArrayArg
-    });
-    return config;
-});
-exports.run = () => __awaiter(this, void 0, void 0, function* () {
-    let config = yield getQenvKeyValueObject().then(buildConfig);
-    return config;
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUE4QztBQUM5QywyQ0FBMEM7QUFXekMsQ0FBQztBQUVGLElBQUkscUJBQXFCLEdBQUc7SUFDMUIsSUFBSSx1QkFBMEMsQ0FBQTtJQUM5QyxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsRix1QkFBdUIsR0FBRyxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUMsbUJBQW1CLENBQUE7SUFDM0YsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sdUJBQXVCLEdBQUcsRUFBRSxDQUFBO0lBQzlCLENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFDLHVCQUF1QixDQUFBO0FBQ2hDLENBQUMsQ0FBQSxDQUFBO0FBRUQsSUFBSSxXQUFXLEdBQUcsQ0FBTywwQkFBNkM7SUFDcEUsSUFBSSxRQUFRLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDdkQsSUFBSSxNQUFNLEdBQUcsUUFBUSxDQUFDLE9BQU8sQ0FDM0IsV0FBVyxFQUNYO1FBQ0UsU0FBUyxFQUFFLGdDQUFnQztRQUMzQyxPQUFPLEVBQUUsbUJBQW1CO1FBQzVCLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLG1CQUFtQixFQUFFLDBCQUEwQjtLQUNoRCxDQUNGLENBQUE7SUFDRCxNQUFNLENBQUMsTUFBTSxDQUFBO0FBQ2YsQ0FBQyxDQUFBLENBQUE7QUFFVSxRQUFBLEdBQUcsR0FBRztJQUNmLElBQUksTUFBTSxHQUFHLE1BQU0scUJBQXFCLEVBQUUsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUE7SUFDNUQsTUFBTSxDQUFDLE1BQU0sQ0FBQTtBQUNmLENBQUMsQ0FBQSxDQUFBIn0=

dist/npmdocker.docker.d.ts

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

dist/npmdocker.paths.d.ts

@@ -1,5 +0,0 @@
-export declare let cwd: string;
-export declare let packageBase: string;
-export declare let assets: string;
-export declare let buildContextDir: string;
-export declare let dockerfile: string;

dist/npmdocker.paths.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./npmdocker.plugins");
-// directories
-exports.cwd = process.cwd();
-exports.packageBase = plugins.path.join(__dirname, "../");
-exports.assets = plugins.path.join(exports.packageBase, "assets/");
-plugins.smartfile.fs.ensureDirSync(exports.assets);
-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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBRS9DLGNBQWM7QUFDSCxRQUFBLEdBQUcsR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDcEIsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2xELFFBQUEsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLG1CQUFXLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFDOUQsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsYUFBYSxDQUFDLGNBQU0sQ0FBQyxDQUFDO0FBRWhDLFFBQUEsZUFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBQyxpQkFBaUIsQ0FBQyxDQUFDO0FBQ3pFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyx1QkFBZSxDQUFDLENBQUM7QUFFcEQsUUFBUTtBQUNHLFFBQUEsVUFBVSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBRSxZQUFZLENBQUMsQ0FBQyJ9

dist/npmdocker.plugins.d.ts

@@ -1,13 +0,0 @@
-import 'typings-global';
-import * as beautylog from 'beautylog';
-import * as npmextra from 'npmextra';
-import * as path from 'path';
-import * as projectinfo from 'projectinfo';
-import * as q from 'smartq';
-import * as qenv from 'qenv';
-import * as smartanalytics from 'smartanalytics';
-import * as smartcli from 'smartcli';
-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,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-global");
-const beautylog = require("beautylog");
-exports.beautylog = beautylog;
-const npmextra = require("npmextra");
-exports.npmextra = npmextra;
-const path = require("path");
-exports.path = path;
-const projectinfo = require("projectinfo");
-exports.projectinfo = projectinfo;
-const q = require("smartq");
-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.snippets.d.ts

@@ -1,5 +0,0 @@
-export interface IDockerfileSnippet {
-    baseImage: string;
-    command: string;
-}
-export declare let dockerfileSnippet: (optionsArg: IDockerfileSnippet) => string;

dist/npmdocker.snippets.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./npmdocker.plugins");
-exports.dockerfileSnippet = (optionsArg) => {
-    return plugins.smartstring.indent.normalize(`
-        FROM ${optionsArg.baseImage}
-        RUN yarn global add npmdocker
-        COPY ./buildContextDir /workspace
-        WORKDIR /workspace
-        ENV CI=true
-        CMD ["npmdocker","runinside"];
-    `);
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQStDO0FBT3BDLFFBQUEsaUJBQWlCLEdBQUcsQ0FBQyxVQUE4QjtJQUM1RCxNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO2VBQy9CLFVBQVUsQ0FBQyxTQUFTOzs7Ozs7S0FNOUIsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFBIn0=

docs/index.md

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

npmextra.json

@@ -1,12 +1,13 @@
 {
-    "npmts":{
-        "mode":"default",
-        "cli":true,
-        "dockerSock":true
-    },
-    "npmci": {
-        "globalNpmTools": [
-            "npmts"
-        ]
-    }
+  "npmts": {
+    "mode": "default",
+    "cli": true
+  },
+  "npmci": {
+    "npmGlobalTools": [
+      "@gitzone/npmts",
+      "ts-node"
+    ],
+    "npmAccessLevel": "public"
+  }
 }

package.json

@@ -1,20 +1,19 @@
 {
-  "name": "npmdocker",
-  "version": "1.2.13",
+  "name": "@gitzone/npmdocker",
+  "version": "1.2.24",
+  "private": false,
   "description": "develop npm modules cross platform with docker",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "npmdocker": "dist/cli.js"
-  },
-  "directories": {
-    "test": "test"
+    "npmdocker": "cli.js"
   },
   "scripts": {
-    "test": "(npm run clean && npm run compile && npm run setupCheck && npm run testStandard && npm run testSpeed && npm run testClean)",
-    "testStandard": "(cd test/ && node ../dist/index.js)",
-    "testSpeed": "(cd test/ && node ../dist/index.js speedtest)",
-    "testClean": "(cd test/ && node ../dist/index.js clean --all)",
+    "test": "(npm run clean && npm run setupCheck && npm run testStandard && npm run testSpeed)",
+    "build": "tsbuild",
+    "testStandard": "(cd test/ && node ../cli.ts.js)",
+    "testSpeed": "(cd test/ && node ../cli.ts.js speedtest)",
+    "testClean": "(cd test/ && node ../cli.ts.js clean --all)",
     "clean": "(rm -rf test/)",
     "compile": "(npmts --notest)",
     "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)"
@@ -32,19 +31,24 @@
     "url": "https://gitlab.com/gitzone/npmdocker/issues"
   },
   "homepage": "https://gitlab.com/gitzone/npmdocker#README",
-  "devDependencies": {},
+  "devDependencies": {
+    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsrun": "^1.1.12",
+    "@gitzone/tstest": "^1.0.15",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.9.4"
+  },
   "dependencies": {
-    "@types/shelljs": "0.x.x",
+    "@pushrocks/npmextra": "^3.0.1",
+    "@pushrocks/projectinfo": "^4.0.2",
+    "@pushrocks/qenv": "^2.0.2",
+    "@pushrocks/smartcli": "^3.0.4",
+    "@pushrocks/smartfile": "^6.0.8",
+    "@pushrocks/smartpromise": "^2.0.5",
+    "@pushrocks/smartshell": "^2.0.6",
+    "@pushrocks/smartstring": "^3.0.4",
+    "@types/shelljs": "^0.8.0",
     "beautylog": "^6.1.10",
-    "npmextra": "^2.0.9",
-    "projectinfo": "^3.0.4",
-    "qenv": "^1.1.7",
-    "smartanalytics": "^2.0.9",
-    "smartcli": "^2.0.7",
-    "smartfile": "^4.2.26",
-    "smartq": "^1.1.6",
-    "smartshell": "^1.0.18",
-    "smartstring": "^2.0.24",
-    "typings-global": "^1.0.20"
+    "smartanalytics": "^2.0.9"
   }
 }

ts/analytics.ts

@@ -0,0 +1,20 @@
+/**
+ * smartanalytics:
+ * We count executions of this tool to keep track which of our tools are really used.
+ * This insight is used to plan spending our limited resources for improving them.
+ * Any submitted analytics data is fully anonymized (no Ips or any other personal information is tracked).
+ * Feel free to dig into the smartanalytics package, if you are interested in how it works.
+ * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
+ * The privacy policy is also linked in the readme, so we hope this behaviour does not come as a surprise to you.
+ * Have a nice day and regards
+ * Your Open Source team at Lossless GmbH :)
+ */
+import * as smartanalytics from 'smartanalytics';
+let npmdockerAnalytics = new smartanalytics.Analytics({
+  apiEndPoint: 'https://pubapi.lossless.one',
+  appName: 'npmdocker',
+  projectId: 'gitzone'
+});
+npmdockerAnalytics.recordEvent('npmtoolexecution', {
+  somedata: 'somedata'
+});

ts/index.ts

@@ -1,4 +1,5 @@
-import * as plugins from './npmdocker.plugins'
-import * as cli from './npmdocker.cli'
+import './analytics';
+import * as plugins from './npmdocker.plugins';
+import * as cli from './npmdocker.cli';
 
-cli.run()
+cli.run();

ts/npmdocker.cli.ts

@@ -1,81 +1,76 @@
-import * as plugins from './npmdocker.plugins'
-import * as paths from './npmdocker.paths'
+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'
+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()
+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)
+  npmdockerCli.standardTask().subscribe(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!')
+      plugins.beautylog.success('container ended all right!');
     } else {
-      plugins.beautylog.error(`container ended with error! Exit Code is ${configArg.exitCode}`)
-      process.exit(1)
+      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('runinside').subscribe(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();
+    const smartshellInstance = new plugins.smartshell.Smartshell({
+      executor: 'bash'
     })
-  })
+    await smartshellInstance.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...')
+  npmdockerCli.addCommand('clean').subscribe(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)`)
+      const smartshellInstance = new plugins.smartshell.Smartshell({
+        executor: 'bash'
+      })
+      plugins.beautylog.ora.text('killing any running docker containers...');
+      await smartshellInstance.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 stopped containers...');
+      await smartshellInstance.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 images...');
+      await smartshellInstance.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 other images...');
+      await smartshellInstance.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.text('removing all volumes...');
+      await smartshellInstance.exec(`docker volume rm $(docker volume ls -f dangling=true -q)`);
     }
-    plugins.beautylog.ora.endOk('docker environment now is clean!')
-  })
+    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.addCommand('speedtest').subscribe(async argvArg => {
+    const smartshellInstance = new plugins.smartshell.Smartshell({
+      executor: 'bash'
+    })
+    plugins.beautylog.figletSync('npmdocker');
+    plugins.beautylog.ok('Starting speedtest');
+    await smartshellInstance.exec(
+      `docker pull tianon/speedtest && docker run --rm tianon/speedtest`
+    );
+  });
 
-  npmdockerCli.startParse()
-}
+  npmdockerCli.startParse();
+};

ts/npmdocker.config.ts

@@ -1,42 +1,40 @@
-import * as plugins from './npmdocker.plugins'
-import * as paths from "./npmdocker.paths"
+import * as plugins from './npmdocker.plugins';
+import * as paths from './npmdocker.paths';
 
 // interfaces
-import { IKeyValueObject } from 'qenv'
+import { IKeyValueObject } from '@pushrocks/qenv';
 
 export interface IConfig {
-  baseImage: string
-  command: string
-  dockerSock: boolean
-  exitCode?: number
-  keyValueObjectArray: IKeyValueObject[]
-};
+  baseImage: string;
+  command: string;
+  dockerSock: boolean;
+  exitCode?: number;
+  keyValueObjectArray: IKeyValueObject[];
+}
 
 let getQenvKeyValueObject = async () => {
-  let qenvKeyValueObjectArray: IKeyValueObject[]
+  let qenvKeyValueObjectArray: IKeyValueObject[];
   if (plugins.smartfile.fs.fileExistsSync(plugins.path.join(paths.cwd, 'qenv.yml'))) {
-    qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray
+    qenvKeyValueObjectArray = new plugins.qenv.Qenv(paths.cwd, '.nogit/').keyValueObjectArray;
   } else {
-    qenvKeyValueObjectArray = []
-  };
-  return qenvKeyValueObjectArray
-}
+    qenvKeyValueObjectArray = [];
+  }
+  return qenvKeyValueObjectArray;
+};
 
 let buildConfig = async (qenvKeyValueObjectArrayArg: IKeyValueObject[]) => {
-  let npmextra = new plugins.npmextra.Npmextra(paths.cwd)
-  let config = npmextra.dataFor<IConfig>(
-    'npmdocker',
-    {
-      baseImage: 'hosttoday/ht-docker-node:npmci',
-      command: 'npmci test stable',
-      dockerSock: false,
-      keyValueObjectArray: qenvKeyValueObjectArrayArg
-    }
-  )
-  return config
-}
+  let npmextra = new plugins.npmextra.Npmextra(paths.cwd);
+  let config = npmextra.dataFor<IConfig>('npmdocker', {
+    baseImage: 'hosttoday/ht-docker-node:npmdocker',
+    init: 'rm -rf node_nodules/ && yarn install',
+    command: 'npmci npm test',
+    dockerSock: false,
+    keyValueObjectArray: qenvKeyValueObjectArrayArg
+  });
+  return config;
+};
 
 export let run = async (): Promise<IConfig> => {
-  let config = await getQenvKeyValueObject().then(buildConfig)
-  return config
-}
+  let config = await getQenvKeyValueObject().then(buildConfig);
+  return config;
+};

ts/npmdocker.docker.ts

@@ -1,11 +1,15 @@
 import * as plugins from './npmdocker.plugins';
 import * as paths from './npmdocker.paths';
-import * as snippets from './npmdocker.snippets'
+import * as snippets from './npmdocker.snippets';
+
+const smartshellInstance = new plugins.smartshell.Smartshell({
+  executor: 'bash'
+})
 
 // interfaces
-import { IConfig } from './npmdocker.config'
+import { IConfig } from './npmdocker.config';
 
-let config: IConfig
+let config: IConfig;
 
 /**
  * the docker data used to build the internal testing container
@@ -16,149 +20,138 @@ let dockerData = {
   dockerProjectMountString: '',
   dockerSockString: '',
   dockerEnvString: ''
-}
+};
 
 /**
  * check if docker is available
  */
 let checkDocker = () => {
-  let done = plugins.q.defer()
-  plugins.beautylog.ora.text('checking docker...')
-  if (plugins.smartshell.which('docker')) {
-    plugins.beautylog.ok('Docker found!')
-    done.resolve()
+  let done = plugins.smartpromise.defer();
+  plugins.beautylog.ora.text('checking docker...');
+  
+  if (smartshellInstance.exec('which docker')) {
+    plugins.beautylog.ok('Docker found!');
+    done.resolve();
   } else {
-    done.reject(new Error('docker not found on this machine'))
+    done.reject(new Error('docker not found on this machine'));
   }
-  return done.promise
-}
+  return done.promise;
+};
 
 /**
  * builds the Dockerfile according to the config in the project
  */
 let buildDockerFile = () => {
-  let done = plugins.q.defer()
-  plugins.beautylog.ora.text('building Dockerfile...')
+  let done = plugins.smartpromise.defer();
+  plugins.beautylog.ora.text('building Dockerfile...');
   let dockerfile: string = snippets.dockerfileSnippet({
     baseImage: config.baseImage,
     command: config.command
-  })
-  plugins.beautylog.info(`Base image is: ${config.baseImage}`)
-  plugins.beautylog.info(`Command is: ${config.command}`)
-  plugins.smartfile.memory.toFsSync(dockerfile, paths.dockerfile)
-  plugins.beautylog.ok('Dockerfile created!')
-  done.resolve()
-  return done.promise
-}
+  });
+  plugins.beautylog.info(`Base image is: ${config.baseImage}`);
+  plugins.beautylog.info(`Command is: ${config.command}`);
+  plugins.smartfile.memory.toFsSync(dockerfile, plugins.path.join(paths.cwd, 'npmdocker'));
+  plugins.beautylog.ok('Dockerfile created!');
+  plugins.beautylog.ora.stop();
+  done.resolve();
+  return done.promise;
+};
 
 /**
  * builds the Dockerimage from the built Dockerfile
  */
 let buildDockerImage = async () => {
-  plugins.beautylog.ora.text('pulling latest base image from registry...')
-  await plugins.smartshell.execSilent(
-    `docker pull ${config.baseImage}`
-  ).then(async () => {
-    plugins.beautylog.ora.text('building Dockerimage...')
-    // are we creating a build context form project ?
-    if (process.env.CI === 'true') {
-      plugins.beautylog.ora.text('creating build context...')
-      plugins.smartfile.fs.copySync(paths.cwd, paths.buildContextDir)
-    }
-    await plugins.smartshell.execSilent(
-      `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!')
-    })
-  })
-}
+  plugins.beautylog.info('pulling latest base image from registry...');
+  await smartshellInstance.exec(`docker pull ${config.baseImage}`);
+  plugins.beautylog.ora.text('building Dockerimage...');
+  let execResult = await smartshellInstance.execSilent(
+    `docker build -f npmdocker -t ${dockerData.imageTag} ${paths.cwd}`
+  );
+  if (execResult.exitCode !== 0) {
+    console.log(execResult.stdout);
+    process.exit(1);
+  }
+  plugins.beautylog.ok('Dockerimage built!');
+};
 
 let buildDockerProjectMountString = async () => {
   if (process.env.CI !== 'true') {
-    dockerData.dockerProjectMountString = `-v ${paths.cwd}:/workspace`
-  };
-}
+    dockerData.dockerProjectMountString = `-v ${paths.cwd}:/workspace`;
+  }
+};
 
 /**
  * builds an environment string that docker cli understands
  */
 let buildDockerEnvString = async () => {
   for (let keyValueObjectArg of config.keyValueObjectArray) {
-    let envString = dockerData.dockerEnvString = dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `
-  };
-}
+    let envString = (dockerData.dockerEnvString =
+      dockerData.dockerEnvString + `-e ${keyValueObjectArg.key}=${keyValueObjectArg.value} `);
+  }
+};
 
 /**
  * creates string to mount the docker.sock inside the testcontainer
  */
 let buildDockerSockString = async () => {
   if (config.dockerSock) {
-    dockerData.dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`
-  };
-}
+    dockerData.dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`;
+  }
+};
 
 /**
  * creates a container by running the built Dockerimage
  */
 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 = (await plugins.smartshell.exec(`docker run ${dockerData.dockerProjectMountString} ${dockerData.dockerSockString} ${dockerData.dockerEnvString} --name ${dockerData.containerName} ${dockerData.imageTag}`)).exitCode
-}
+  let done = plugins.smartpromise.defer();
+  plugins.beautylog.ora.text('starting Container...');
+  plugins.beautylog.ora.end();
+  plugins.beautylog.log('now running Dockerimage');
+  config.exitCode = (await smartshellInstance.exec(
+    `docker run ${dockerData.dockerProjectMountString} ${dockerData.dockerSockString} ${
+      dockerData.dockerEnvString
+    } --name ${dockerData.containerName} ${dockerData.imageTag}`
+  )).exitCode;
+};
 
 /**
  * cleans up: deletes the test container
  */
 let deleteDockerContainer = async () => {
-  await plugins.smartshell.execSilent(`docker rm -f ${dockerData.containerName}`)
-}
+  await smartshellInstance.execSilent(`docker rm -f ${dockerData.containerName}`);
+};
 
 /**
  * cleans up deletes the test image
  */
 let deleteDockerImage = async () => {
-  await plugins.smartshell.execSilent(`docker rmi ${dockerData.imageTag}`).then(async (response) => {
+  await smartshellInstance.execSilent(`docker rmi ${dockerData.imageTag}`).then(async response => {
     if (response.exitCode !== 0) {
-      console.log(response.stdout)
+      console.log(response.stdout);
     }
-  })
-}
-
-/**
- * cleans up, deletes the build context
- */
-let deleteBuildContext = async () => {
-  await plugins.smartfile.fs.remove(paths.buildContextDir)
-}
+  });
+};
 
 let preClean = async () => {
   await deleteDockerImage()
     .then(deleteDockerContainer)
     .then(async () => {
-      plugins.beautylog.ok('ensured clean Docker environment!')
-    })
-}
+      plugins.beautylog.ok('ensured clean Docker environment!');
+    });
+};
 
 let postClean = async () => {
   await deleteDockerContainer()
     .then(deleteDockerImage)
-    .then(deleteBuildContext)
     .then(async () => {
-      plugins.beautylog.ok('cleaned up!')
-    })
-}
-
-
+      plugins.beautylog.ok('cleaned up!');
+    });
+  plugins.smartfile.fs.removeSync(paths.npmdockerFile);
+};
 
 export let run = async (configArg: IConfig): Promise<IConfig> => {
-  plugins.beautylog.ora.start()
-  config = configArg
+  plugins.beautylog.ora.start();
+  config = configArg;
   let resultConfig = await checkDocker()
     .then(preClean)
     .then(buildDockerFile)
@@ -168,6 +161,8 @@ export let run = async (configArg: IConfig): Promise<IConfig> => {
     .then(buildDockerSockString)
     .then(runDockerImage)
     .then(postClean)
-    .catch(err => { console.log(err) })
-  return config
-}
+    .catch(err => {
+      console.log(err);
+    });
+  return config;
+};

ts/npmdocker.paths.ts

@@ -1,13 +1,8 @@
-import * as plugins from "./npmdocker.plugins";
+import * as plugins from './npmdocker.plugins';
 
 // directories
 export let cwd = process.cwd();
-export let packageBase = plugins.path.join(__dirname, "../");
-export let assets = plugins.path.join(packageBase, "assets/");
+export let packageBase = plugins.path.join(__dirname, '../');
+export let assets = plugins.path.join(packageBase, 'assets/');
 plugins.smartfile.fs.ensureDirSync(assets);
-
-export let buildContextDir = plugins.path.join(assets,"buildContextDir");
-plugins.smartfile.fs.ensureDirSync(buildContextDir);
-
-// files
-export let dockerfile = plugins.path.join(assets, "Dockerfile");
+export let npmdockerFile = plugins.path.join(cwd, 'npmdocker');

ts/npmdocker.plugins.ts

@@ -1,26 +1,23 @@
-import 'typings-global'
-import * as beautylog from 'beautylog'
-import * as npmextra from 'npmextra'
-import * as path from 'path'
-import * as projectinfo from 'projectinfo'
-import * as q from 'smartq'
-import * as qenv from 'qenv'
-import * as smartanalytics from 'smartanalytics'
-import * as smartcli from 'smartcli'
-import * as smartfile from 'smartfile'
-import * as smartshell from 'smartshell'
-import * as smartstring from 'smartstring'
+import * as beautylog from 'beautylog';
+import * as npmextra from '@pushrocks/npmextra';
+import * as path from 'path';
+import * as projectinfo from '@pushrocks/projectinfo';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as qenv from '@pushrocks/qenv';
+import * as smartcli from '@pushrocks/smartcli';
+import * as smartfile from '@pushrocks/smartfile';
+import * as smartshell from '@pushrocks/smartshell';
+import * as smartstring from '@pushrocks/smartstring';
 
 export {
   beautylog,
   npmextra,
   path,
   projectinfo,
-  q,
+  smartpromise,
   qenv,
-  smartanalytics,
   smartcli,
   smartfile,
   smartshell,
   smartstring
-}
+};

ts/npmdocker.snippets.ts

@@ -1,17 +1,37 @@
-import * as plugins from "./npmdocker.plugins";
+import * as plugins from './npmdocker.plugins';
 
 export interface IDockerfileSnippet {
   baseImage: string;
   command: string;
 }
 
+let getMountSolutionString = (optionsArg: IDockerfileSnippet) => {
+  if (process.env.CI) {
+    return 'COPY ./ /workspace';
+  } else {
+    return '# not copying workspcae since not in CI';
+  }
+};
+
+let getGlobalPreparationString = (optionsArg: IDockerfileSnippet) => {
+  if (optionsArg.baseImage !== 'hosttoday/ht-docker-node:npmdocker') {
+    return 'RUN npm install -g npmdocker';
+  } else {
+    return '# not installing npmdocker since it is included in the base image';
+  }
+};
+
 export let dockerfileSnippet = (optionsArg: IDockerfileSnippet): string => {
-  return plugins.smartstring.indent.normalize(`
-        FROM ${optionsArg.baseImage}
-        RUN yarn global add npmdocker
-        COPY ./buildContextDir /workspace
-        WORKDIR /workspace
-        ENV CI=true
-        CMD ["npmdocker","runinside"];
-    `)
-}
+  return plugins.smartstring.indent.normalize(
+    `
+FROM ${optionsArg.baseImage}
+# For info about what npmdocker does read the docs at https://gitzone.github.io/npmdocker
+${getGlobalPreparationString(optionsArg)}
+${getMountSolutionString(optionsArg)}
+WORKDIR /workspace
+ENV CI=true
+ENTRYPOINT ["npmdocker"]
+CMD ["runinside"]
+`
+  );
+};