1.2.40

.gitignore

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

.gitlab-ci.yml

@@ -1,35 +1,69 @@
-image: hosttoday/ht-docker-node:npmts
+image: hosttoday/ht-docker-dbase:npmci
+services:
+  - docker:dind
 
 stages:
+- mirror
 - test
 - release
+- trigger
+- pages
 
-testLEGACY:
-  stage: test
+mirror:
+  image: hosttoday/ht-docker-node:npmci
+  stage: mirror
   script:
-    - npmci test legacy
+    - npmci git mirror
   tags:
     - docker
 
-testLTS:
+
+test:
   stage: test
   script:
-    - npmci test lts
-  tags:
-    - docker
-    
-testSTABLE:
-  stage: test
-  script:
-    - npmci test stable
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   tags:
     - docker
+    - lossless
+    - priv
 
 release:
   stage: release
+  environment: npmjs-com_registry
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:
     - docker
+    - lossless
+    - priv
+
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - 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

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

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

@@ -0,0 +1,6 @@
+FROM hosttoday/ht-docker-node:npmci
+RUN yarn global add @gitzone/tsdocker
+COPY ./ /workspace
+WORKDIR /workspace
+ENV CI=true
+CMD ["tsdocker","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/index.js

@@ -1 +0,0 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

npmextra.json

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

ts/index.ts

@@ -0,0 +1,4 @@
+import * as plugins from './tsdocker.plugins';
+import * as cli from './tsdocker.cli';
+
+cli.run();

ts/tsdocker.cli.ts

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

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

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

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

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

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

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

@@ -0,0 +1,17 @@
+{
+  "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"
+}