.gitignore

@@ -1,23 +1,6 @@
-.nogit/
-
-# artifacts
-coverage/
-public/
-pages/
-
-# installs
 node_modules/
-
+coverage/
-# caches
+docs/
-.yarn/
+test/
-.cache/
+assets/
-.rpt2_cache
+.nogit/
-
-# builds
-dist/
-dist_web/
-dist_serve/
-dist_ts_web/
-
-# custom
-test

.gitlab-ci.yml

@@ -1,40 +1,28 @@
-image: hosttoday/ht-docker-dbase:npmci
+image: hosttoday/ht-docker-dbase:npmts
 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:
-    - npmci node install stable
+    - npm install
-    - npmci npm install
+    - npm test
-    - npmci npm test
   tags:
     - docker
     - lossless
     - priv
 
 release:
+  image: hosttoday/ht-docker-node:npmts
   stage: release
   environment: npmjs-com_registry
   script:
-    - npmci npm prepare
+    - npmci publish
-    - npmci npm publish
   only:
     - tags
   tags:
@@ -52,18 +40,3 @@ trigger:
     - docker
     - lossless
     - priv
-
-pages:
-  image: hosttoday/ht-docker-node:npmci
-  stage: pages
-  script:
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci command tsdoc
-  only:
-    - tags
-  tags:
-    - docker
-  artifacts:
-    expire_in: 1 week
-    paths:
-    - public

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules/typescript/lib"
-}

Dockerfile

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

README.md

@@ -0,0 +1,5 @@
+# npmdocker
+develop npm modules cross platform with docker
+
+## Usage
+npmdocker looks for a npmextra.json at the root of your directory and looks at the npmdocker portion of it.

assets/Dockerfile

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

cli.js

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

cli.ts.js

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

dist/cli.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+var index = require("./index.js");

dist/index.js

@@ -0,0 +1,14 @@
+"use strict";
+const plugins = require("./npmdocker.plugins");
+const promisechain = require("./npmdocker.promisechain");
+promisechain.run()
+    .then((configArg) => {
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsTUFBWSxPQUFPLFdBQU0scUJBQXFCLENBQUMsQ0FBQTtBQUMvQyxNQUFZLFlBQVksV0FBTSwwQkFBMEIsQ0FBQyxDQUFBO0FBSXpELFlBQVksQ0FBQyxHQUFHLEVBQUU7S0FDYixJQUFJLENBQUMsQ0FBQyxTQUE4QjtJQUNqQyxFQUFFLENBQUEsQ0FBQyxTQUFTLENBQUMsUUFBUSxJQUFJLENBQUMsQ0FBQyxDQUFBLENBQUM7UUFDeEIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO1FBQ3ZELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDcEIsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDIn0=

dist/npmdocker.config.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="q" />
+import * as plugins from "./npmdocker.plugins";
+export interface IConfig {
+    baseImage: string;
+    command: string;
+    dockerSock: boolean;
+    exitCode?: number;
+}
+export declare let run: () => plugins.q.Promise<{}>;

dist/npmdocker.config.js

@@ -0,0 +1,16 @@
+"use strict";
+const plugins = require("./npmdocker.plugins");
+let config = plugins.npmextra.dataFor({
+    toolName: "npmdocker",
+    defaultSettings: {
+        baseImage: "hosttoday/ht-docker-node:npmts",
+        command: "npm test",
+        dockerSock: false
+    }
+});
+exports.run = () => {
+    let done = plugins.q.defer();
+    done.resolve(config);
+    return done.promise;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLmNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFVL0MsSUFBSSxNQUFNLEdBQVcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7SUFDMUMsUUFBUSxFQUFDLFdBQVc7SUFDcEIsZUFBZSxFQUFFO1FBQ2IsU0FBUyxFQUFDLGdDQUFnQztRQUMxQyxPQUFPLEVBQUMsVUFBVTtRQUNsQixVQUFVLEVBQUUsS0FBSztLQUNwQjtDQUNKLENBQUMsQ0FBQztBQUVRLFdBQUcsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNyQixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztBQUN4QixDQUFDLENBQUEifQ==

dist/npmdocker.docker.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="q" />
+import * as plugins from "./npmdocker.plugins";
+export declare let run: (configArg: any) => plugins.q.Promise<{}>;

dist/npmdocker.paths.d.ts

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

@@ -0,0 +1,12 @@
+"use strict";
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBhdGhzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnBhdGhzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxxQkFBcUIsQ0FBQyxDQUFBO0FBRS9DLGNBQWM7QUFDSCxXQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBQ3BCLG1CQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQ2xELGNBQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBVyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0FBQzlELE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxjQUFNLENBQUMsQ0FBQztBQUVoQyx1QkFBZSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGNBQU0sRUFBQyxpQkFBaUIsQ0FBQyxDQUFDO0FBQ3pFLE9BQU8sQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyx1QkFBZSxDQUFDLENBQUM7QUFFcEQsUUFBUTtBQUNHLGtCQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBTSxFQUFFLFlBQVksQ0FBQyxDQUFDIn0=

dist/npmdocker.plugins.d.ts

@@ -0,0 +1,8 @@
+import "typings-global";
+export import beautylog = require("beautylog");
+export import npmextra = require("npmextra");
+export import path = require("path");
+export import q = require("q");
+export import shelljs = require("shelljs");
+export import smartfile = require("smartfile");
+export import smartstring = require("smartstring");

dist/npmdocker.plugins.js

@@ -0,0 +1,10 @@
+"use strict";
+require("typings-global");
+exports.beautylog = require("beautylog");
+exports.npmextra = require("npmextra");
+exports.path = require("path");
+exports.q = require("q");
+exports.shelljs = require("shelljs");
+exports.smartfile = require("smartfile");
+exports.smartstring = require("smartstring");
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9ucG1kb2NrZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ1YsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNqQyxnQkFBUSxXQUFXLFVBQVUsQ0FBQyxDQUFDO0FBQy9CLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQztBQUN2QixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDakIsZUFBTyxXQUFXLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDakMsbUJBQVcsV0FBVyxhQUFhLENBQUMsQ0FBQyJ9

dist/npmdocker.promisechain.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="q" />
+import * as plugins from "./npmdocker.plugins";
+import { Ora } from "beautylog";
+export declare let npmdockerOra: Ora;
+export declare let run: () => plugins.q.Promise<{}>;

dist/npmdocker.promisechain.js

@@ -0,0 +1,18 @@
+"use strict";
+const plugins = require("./npmdocker.plugins");
+const beautylog_1 = require("beautylog");
+//modules
+const ConfigModule = require("./npmdocker.config");
+const DockerModule = require("./npmdocker.docker");
+exports.npmdockerOra = new beautylog_1.Ora("npmdocker", "blue");
+exports.npmdockerOra.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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnByb21pc2VjaGFpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWRvY2tlci5wcm9taXNlY2hhaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFFL0MsNEJBQWtCLFdBQVcsQ0FBQyxDQUFBO0FBQzlCLFNBQVM7QUFDVCxNQUFZLFlBQVksV0FBTSxvQkFBb0IsQ0FBQyxDQUFBO0FBQ25ELE1BQVksWUFBWSxXQUFNLG9CQUFvQixDQUFDLENBQUE7QUFFeEMsb0JBQVksR0FBRyxJQUFJLGVBQUcsQ0FBQyxXQUFXLEVBQUMsTUFBTSxDQUFDLENBQUM7QUFDdEQsb0JBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUNWLFdBQUcsR0FBRztJQUNiLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDN0IsWUFBWSxDQUFDLEdBQUcsRUFBRTtTQUNiLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDO1NBQ3RCLElBQUksQ0FBQyxDQUFDLFNBQVM7UUFDWixJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQzVCLENBQUMsQ0FBQyxDQUFBO0lBQ04sTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7QUFDeEIsQ0FBQyxDQUFBIn0=

dist/npmdocker.snippets.d.ts

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

dist/npmdocker.snippets.js

@@ -0,0 +1,21 @@
+"use strict";
+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}
+        COPY ./buildContextDir /workspace
+        WORKDIR /workspace
+        ENV CI=true
+        CMD [${commandString}];
+    `);
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtZG9ja2VyLnNuaXBwZXRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbnBtZG9ja2VyLnNuaXBwZXRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxNQUFZLE9BQU8sV0FBTSxxQkFBcUIsQ0FBQyxDQUFBO0FBT3BDLHlCQUFpQixHQUFHLENBQUMsVUFBNkI7SUFDekQsSUFBSSxZQUFZLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbEQsSUFBSSxhQUFhLEdBQVUsRUFBRSxDQUFDO0lBQzlCLEdBQUcsQ0FBQSxDQUFDLElBQUksVUFBVSxJQUFJLFlBQVksQ0FBQyxDQUFBLENBQUM7UUFDaEMsRUFBRSxDQUFBLENBQUMsQ0FBQyxDQUFDLGFBQWEsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFBLENBQUM7WUFDdkIsYUFBYSxHQUFHLGFBQWEsR0FBRyxHQUFHLENBQUM7UUFDeEMsQ0FBQztRQUNELGFBQWEsR0FBRyxhQUFhLEdBQUcsR0FBRyxHQUFHLFVBQVUsR0FBRyxHQUFHLENBQUM7SUFDM0QsQ0FBQztJQUFBLENBQUM7SUFDRixNQUFNLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO2VBQ2pDLFVBQVUsQ0FBQyxTQUFTOzs7O2VBSXBCLGFBQWE7S0FDdkIsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFBIn0=

npmextra.json

@@ -1,20 +1,7 @@
 {
     "npmts":{
         "mode":"default",
-    "cli": true
+        "cli":true,
-  },
+        "dockerSock":true
-  "npmci": {
-    "npmGlobalTools": [],
-    "npmAccessLevel": "public"
-  },
-  "gitzone": {
-    "module": {
-      "githost": "gitlab.com",
-      "gitscope": "gitzone",
-      "gitrepo": "npmdocker",
-      "shortDescription": "develop npm modules cross platform with docker",
-      "npmPackagename": "@gitzone/npmdocker",
-      "license": "MIT"
-    }
     }
 }

package.json

@@ -1,27 +1,25 @@
 {
-  "name": "@gitzone/tsdocker",
+  "name": "npmdocker",
-  "version": "1.2.40",
+  "version": "1.1.3",
-  "private": false,
   "description": "develop npm modules cross platform with docker",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "bin": {
-    "tsdocker": "cli.js"
+    "npmdocker": "dist/cli.js"
+  },
+  "directories": {
+    "test": "test"
   },
   "scripts": {
-    "test": "(npm run clean && npm run setupCheck && npm run testStandard && npm run testSpeed)",
+    "test": "(npm run clean && npm run compile && npm run setupCheck && npm run check)",
-    "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)",
-    "testVscode": "(cd test/ && node ../cli.ts.js vscode)",
     "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",
-    "url": "git+ssh://git@gitlab.com/gitzone/npmdocker.git"
+    "url": "git+ssh://git@gitlab.com/pushrocks/npmdocker.git"
   },
   "keywords": [
     "docker"
@@ -29,32 +27,24 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/gitzone/npmdocker/issues"
+    "url": "https://gitlab.com/pushrocks/npmdocker/issues"
   },
-  "homepage": "https://gitlab.com/gitzone/npmdocker#README",
+  "homepage": "https://gitlab.com/pushrocks/npmdocker#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.27",
+    "npmts-g": "^5.2.6",
-    "@gitzone/tsrun": "^1.2.17",
+    "should": "^10.0.0",
-    "@gitzone/tstest": "^1.0.57",
+    "typings-test": "^1.0.1"
-    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^16.10.1",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/npmextra": "^3.0.9",
+    "@types/q": "^0.0.27",
-    "@pushrocks/projectinfo": "^4.0.5",
+    "@types/shelljs": "^0.3.27",
-    "@pushrocks/qenv": "^4.0.10",
+    "beautylog": "^5.0.14",
-    "@pushrocks/smartanalytics": "^2.0.15",
+    "npmextra": "^1.0.8",
-    "@pushrocks/smartcli": "^3.0.14",
+    "q": "^1.4.1",
-    "@pushrocks/smartfile": "^8.0.10",
+    "rxjs": "^5.0.0-beta.10",
-    "@pushrocks/smartlog": "^2.0.44",
+    "shelljs": "^0.7.0",
-    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "smartfile": "^4.0.11",
-    "@pushrocks/smartlog-source-ora": "^1.0.9",
+    "smartstring": "^2.0.15",
-    "@pushrocks/smartopen": "^1.0.22",
+    "typings-global": "^1.0.6"
-    "@pushrocks/smartpromise": "^3.1.6",
-    "@pushrocks/smartshell": "^2.0.28",
-    "@pushrocks/smartstring": "^3.0.24",
-    "@types/shelljs": "^0.8.9"
   }
 }

ts/index.ts

@@ -1,4 +1,15 @@
-import * as plugins from './tsdocker.plugins';
+import * as plugins from "./npmdocker.plugins";
-import * as cli from './tsdocker.cli';
+import * as promisechain from "./npmdocker.promisechain";
+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.config.ts

@@ -0,0 +1,24 @@
+import * as plugins from "./npmdocker.plugins";
+import * as paths from "./npmdocker.paths";
+
+export interface IConfig {
+    baseImage:string;
+    command:string;
+    dockerSock:boolean;
+    exitCode?:number
+}
+
+let config:IConfig = plugins.npmextra.dataFor({
+    toolName:"npmdocker",
+    defaultSettings: {
+        baseImage:"hosttoday/ht-docker-node:npmts",
+        command:"npm test",
+        dockerSock: false
+    }
+});
+
+export let run = () => {
+    let done = plugins.q.defer();
+    done.resolve(config);
+    return done.promise;
+}

ts/npmdocker.docker.ts

@@ -0,0 +1,137 @@
+import * as plugins from "./npmdocker.plugins";
+import * as paths from "./npmdocker.paths";
+import * as snippets from "./npmdocker.snippets";
+
+import {npmdockerOra} from "./npmdocker.promisechain";
+
+let config;
+let dockerData = {
+    imageTag: "npmdocker-temp-image:latest",
+    containerName: "npmdocker-temp-container"
+};
+
+/**
+ * check if docker is available
+ */
+let checkDocker = () => {
+    let done = plugins.q.defer();
+    npmdockerOra.text("checking docker...");
+    if(plugins.shelljs.which("docker")){
+        plugins.beautylog.ok("Docker found!")
+        done.resolve();
+    } else {
+        done.reject(new Error("docker not found on this machine"));
+    }
+    return done.promise;
+};
+
+/**
+ * builds the Dockerfile according to the config in the project
+ */
+let buildDockerFile = () => {
+    let done = plugins.q.defer();
+    npmdockerOra.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
+};
+
+/**
+ * builds the Dockerimage from the built Dockerfile
+ */
+let buildDockerImage = () => {
+    let done = plugins.q.defer();
+    npmdockerOra.text("pulling latest base image from registry...");
+    plugins.shelljs.exec(`docker pull ${config.baseImage}`,{
+        silent:true
+    },() => {
+        npmdockerOra.text("building Dockerimage...");
+        // are we creating a build context form project ?
+        if(process.env.CI == "true"){
+            npmdockerOra.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
+    return done.promise
+};
+
+/**
+ * creates a container by running the built Dockerimage
+ */
+let runDockerImage = () => {
+    let done = plugins.q.defer();
+    npmdockerOra.text("starting Container...");
+    npmdockerOra.end();
+    // Are we mounting the project directory?
+    let dockerProjectMountString:string = "";
+    if(process.env.CI != "true"){
+        dockerProjectMountString = `-v ${paths.cwd}:/workspace`
+    };
+    // Are we mounting docker.sock?
+    let dockerSockString:string = "";
+    if(config.dockerSock){
+        dockerSockString = `-v /var/run/docker.sock:/var/run/docker.sock`
+    };
+    config.exitCode = plugins.shelljs.exec(`docker run ${dockerProjectMountString} ${dockerSockString} --name ${dockerData.containerName} ${dockerData.imageTag}`).code;
+    done.resolve();
+    return done.promise;
+};
+
+let deleteDockerContainter = () => {
+    let done = plugins.q.defer();
+    plugins.shelljs.exec(`docker rm ${dockerData.containerName}`,{
+        silent:true
+    });
+    done.resolve();
+    plugins.beautylog.ok("removed test container!");
+    return done.promise
+};
+
+let deleteDockerImage = () => {
+    let done = plugins.q.defer();
+    plugins.shelljs.exec(`docker rmi ${dockerData.imageTag}`,{
+        silent:true
+    });
+    plugins.beautylog.ok("removed test image!");
+    plugins.beautylog.ok("Cleaned up!");
+    done.resolve();
+    return done.promise
+};
+
+let deleteBuildContext = () => {
+    let done = plugins.q.defer();
+    plugins.smartfile.fs.removeSync(paths.buildContextDir);
+    done.resolve();
+    return done.promise;
+}
+
+
+
+export let run = (configArg) => {
+    let done = plugins.q.defer();
+    config = configArg;
+    checkDocker()
+        .then(buildDockerFile)
+        .then(buildDockerImage)
+        .then(runDockerImage)
+        .then(deleteDockerContainter)
+        .then(deleteDockerImage)
+        .then(deleteBuildContext)
+        .then(() => {
+            done.resolve(config);
+        })
+    return done.promise;
+}

ts/npmdocker.paths.ts

@@ -0,0 +1,13 @@
+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/");
+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");

ts/npmdocker.plugins.ts

@@ -0,0 +1,8 @@
+import "typings-global";
+export import beautylog = require("beautylog");
+export import npmextra = require("npmextra");
+export import path = require("path");
+export import q = require("q");
+export import shelljs = require("shelljs");
+export import smartfile = require("smartfile");
+export import smartstring = require("smartstring");

ts/npmdocker.promisechain.ts

@@ -0,0 +1,18 @@
+import * as plugins from "./npmdocker.plugins";
+import * as paths from "./npmdocker.paths";
+import {Ora} from "beautylog";
+//modules
+import * as ConfigModule from "./npmdocker.config";
+import * as DockerModule from "./npmdocker.docker";
+
+export let npmdockerOra = new Ora("npmdocker","blue");
+npmdockerOra.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

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

ts/tsdocker.cli.ts

@@ -1,90 +0,0 @@
-import * as plugins from './tsdocker.plugins';
-import * as paths from './tsdocker.paths';
-
-// modules
-import * as ConfigModule from './tsdocker.config';
-import * as DockerModule from './tsdocker.docker';
-
-import { logger, ora } from './tsdocker.logging';
-
-const tsdockerCli = new plugins.smartcli.Smartcli();
-
-export let run = () => {
-  tsdockerCli.standardTask().subscribe(async argvArg => {
-    const configArg = await ConfigModule.run().then(DockerModule.run);
-    if (configArg.exitCode === 0) {
-      logger.log('success', 'container ended all right!');
-    } else {
-      logger.log('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
-   */
-  tsdockerCli.addCommand('runinside').subscribe(async argvArg => {
-    logger.log('ok', 'Allright. We are now in Docker!');
-    ora.text('now trying to run your specified command');
-    const configArg = await ConfigModule.run();
-    const smartshellInstance = new plugins.smartshell.Smartshell({
-      executor: 'bash'
-    });
-    ora.stop();
-    await smartshellInstance.exec(configArg.command).then(response => {
-      if (response.exitCode !== 0) {
-        process.exit(1);
-      }
-    });
-  });
-
-  tsdockerCli.addCommand('clean').subscribe(async argvArg => {
-    ora.text('cleaning up docker env...');
-    if (argvArg.all) {
-      const smartshellInstance = new plugins.smartshell.Smartshell({
-        executor: 'bash'
-      });
-      ora.text('killing any running docker containers...');
-      await smartshellInstance.exec(`docker kill $(docker ps -q)`);
-
-      ora.text('removing stopped containers...');
-      await smartshellInstance.exec(`docker rm $(docker ps -a -q)`);
-
-      ora.text('removing images...');
-      await smartshellInstance.exec(`docker rmi -f $(docker images -q -f dangling=true)`);
-
-      ora.text('removing all other images...');
-      await smartshellInstance.exec(`docker rmi $(docker images -a -q)`);
-
-      ora.text('removing all volumes...');
-      await smartshellInstance.exec(`docker volume rm $(docker volume ls -f dangling=true -q)`);
-    }
-    ora.finishSuccess('docker environment now is clean!');
-  });
-
-  tsdockerCli.addCommand('speedtest').subscribe(async argvArg => {
-    const smartshellInstance = new plugins.smartshell.Smartshell({
-      executor: 'bash'
-    });
-    logger.log('ok', 'Starting speedtest');
-    await smartshellInstance.exec(
-      `docker pull tianon/speedtest && docker run --rm tianon/speedtest --accept-license --accept-gdpr`
-    );
-  });
-
-  tsdockerCli.addCommand('vscode').subscribe(async argvArg => {
-    const smartshellInstance = new plugins.smartshell.Smartshell({
-      executor: 'bash'
-    });
-    logger.log('ok', `Starting vscode in cwd ${paths.cwd}`);
-    await smartshellInstance.execAndWaitForLine(
-      `docker run -p 127.0.0.1:8443:8443 -v "${
-        paths.cwd
-      }:/home/coder/project" registry.gitlab.com/hosttoday/ht-docker-vscode --allow-http --no-auth`,
-      /Connected to shared process/
-    );
-    await plugins.smartopen.openUrl('testing-vscode.git.zone:8443');
-  });
-
-  tsdockerCli.startParse();
-};

ts/tsdocker.config.ts

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

ts/tsdocker.docker.ts

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

ts/tsdocker.logging.ts

@@ -1,17 +0,0 @@
-import * as plugins from './tsdocker.plugins';
-
-export const logger = new plugins.smartlog.Smartlog({
-  logContext: {
-    company: 'Some Company',
-    companyunit: 'Some CompanyUnit',
-    containerName: 'Some Containername',
-    environment: 'local',
-    runtime: 'node',
-    zone: 'gitzone'
-  },
-  minimumLogLevel: 'silly'
-});
-
-logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());
-
-export const ora = new plugins.smartlogSouceOra.SmartlogSourceOra();

ts/tsdocker.paths.ts

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

ts/tsdocker.plugins.ts

@@ -1,30 +0,0 @@
-// pushrocks scope
-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 smartlog from '@pushrocks/smartlog';
-import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
-import * as smartlogSouceOra from '@pushrocks/smartlog-source-ora';
-import * as smartopen from '@pushrocks/smartopen';
-import * as smartshell from '@pushrocks/smartshell';
-import * as smartstring from '@pushrocks/smartstring';
-
-export {
-  npmextra,
-  path,
-  projectinfo,
-  smartpromise,
-  qenv,
-  smartcli,
-  smartfile,
-  smartlog,
-  smartlogDestinationLocal,
-  smartlogSouceOra,
-  smartopen,
-  smartshell,
-  smartstring
-};

ts/tsdocker.snippets.ts

@@ -1,37 +0,0 @@
-import * as plugins from './tsdocker.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}
-# 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"]
-`
-  );
-};

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}