3.1.36

.gitignore

@@ -8,9 +8,12 @@ pages/
 # installs
 node_modules/
 
-# caches and builds
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
 dist_web/
 dist_serve/

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -49,14 +49,14 @@ testLTS:
   tags:
   - docker
   - notpriv
-    
+
-testSTABLE:
+testBuild:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
@@ -65,7 +65,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -78,19 +78,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm install
-        --env SOURCE_CODE="$PWD"
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
   - docker
   - priv
@@ -109,10 +101,10 @@ pages:
   image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.24",
+  "version": "3.1.36",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
@@ -26,33 +26,43 @@
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.11",
     "@gitzone/tsrun": "^1.2.6",
-    "@gitzone/tstest": "^1.0.20",
+    "@gitzone/tstest": "^1.0.24",
     "@pushrocks/tapbundle": "^3.0.9",
-    "@types/node": "^12.0.0",
+    "@types/node": "^12.0.8",
-    "tslint": "^5.16.0",
+    "tslint": "^5.17.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
     "@pushrocks/lik": "^3.0.5",
-    "@pushrocks/npmextra": "^3.0.1",
+    "@pushrocks/npmextra": "^3.0.5",
     "@pushrocks/projectinfo": "^4.0.2",
     "@pushrocks/smartanalytics": "^2.0.15",
     "@pushrocks/smartcli": "^3.0.7",
     "@pushrocks/smartdelay": "^2.0.3",
     "@pushrocks/smartfile": "^7.0.2",
+    "@pushrocks/smartgit": "^1.0.9",
     "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartlog-destination-local": "^7.0.5",
+    "@pushrocks/smartlog-destination-local": "^8.0.2",
     "@pushrocks/smartparam": "^1.0.4",
     "@pushrocks/smartpromise": "^3.0.2",
-    "@pushrocks/smartrequest": "^1.1.15",
+    "@pushrocks/smartrequest": "^1.1.16",
-    "@pushrocks/smartshell": "^2.0.13",
+    "@pushrocks/smartshell": "^2.0.23",
-    "@pushrocks/smartsocket": "^1.1.36",
+    "@pushrocks/smartsocket": "^1.1.38",
     "@pushrocks/smartssh": "^1.2.3",
     "@pushrocks/smartstring": "^3.0.10",
-    "@types/lodash": "^4.14.124",
     "@types/shelljs": "^0.8.5",
     "@types/through2": "^2.0.34",
-    "lodash": "^4.17.11",
     "through2": "^3.0.1"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

ts/mod_docker/index.ts

@@ -10,6 +10,9 @@ import { Dockerfile } from './mod.classes.dockerfile';
 import { DockerRegistry } from './mod.classes.dockerregistry';
 import { RegistryStorage } from './mod.classes.registrystorage';
 
+// config
+import { configObject } from '../npmci.config';
+
 // instances
 const npmciRegistryStorage = new RegistryStorage();
 
@@ -21,7 +24,7 @@ export let modArgvArg; // will be set through the build command
  * handle cli input
  * @param argvArg
  */
-export let handleCli = async argvArg => {
+export const handleCli = async argvArg => {
   modArgvArg = argvArg;
   if (argvArg._.length >= 2) {
     const action: string = argvArg._[1];
@@ -56,7 +59,7 @@ export let handleCli = async argvArg => {
 /**
  * builds a cwd of Dockerfiles by triggering a promisechain
  */
-export let build = async () => {
+export const build = async () => {
   await prepare();
   logger.log('info', 'now building Dockerfiles...');
   await helpers
@@ -69,7 +72,7 @@ export let build = async () => {
 /**
  * login to the DockerRegistries
  */
-export let login = async () => {
+export const login = async () => {
   await prepare();
   await npmciRegistryStorage.loginAll();
 };
@@ -77,7 +80,7 @@ export let login = async () => {
 /**
  * logs in docker
  */
-export let prepare = async () => {
+export const prepare = async () => {
   // Always login to GitLab Registry
   if (!process.env.CI_BUILD_TOKEN || process.env.CI_BUILD_TOKEN === '') {
     logger.log('error', 'No registry token specified by gitlab!');
@@ -98,31 +101,54 @@ export let prepare = async () => {
   return;
 };
 
-export let push = async argvArg => {
+/**
+ * pushes an image towards a registry
+ * @param argvArg
+ */
+export const push = async argvArg => {
   await prepare();
-  const registryUrlArg = argvArg._[2];
+  let dockerRegistryUrls: string[] = [];
+
+  // lets parse the input of cli and npmextra
+  if (argvArg._.length >= 3 && argvArg._[2] !== 'npmextra') {
+    dockerRegistryUrls.push(argvArg._[2]);
+  } else {
+    if (configObject.dockerRegistries.length === 0) {
+      logger.log(
+        'warn',
+        `There are no docker registries listed in npmextra.json! This is strange!`
+      );
+    }
+    dockerRegistryUrls = dockerRegistryUrls.concat(configObject.dockerRegistries);
+  }
+
+  // lets determine the suffix
   let suffix = null;
   if (argvArg._.length >= 4) {
     suffix = argvArg._[3];
   }
-  const dockerfileArray = await helpers
+
-    .readDockerfiles()
+  // lets push to the registries
-    .then(helpers.sortDockerfiles)
+  for (const dockerRegistryUrl of dockerRegistryUrls) {
-    .then(helpers.mapDockerfiles);
+    const dockerfileArray = await helpers
-  const localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+      .readDockerfiles()
-  if (!localDockerRegistry) {
+      .then(helpers.sortDockerfiles)
-    logger.log(
+      .then(helpers.mapDockerfiles);
-      'error',
+    const dockerRegistryToPushTo = npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
-      `Cannot push to registry ${registryUrlArg}, because it was not found in the authenticated registry list.`
+    if (!dockerRegistryToPushTo) {
-    );
+      logger.log(
-    process.exit(1);
+        'error',
-  }
+        `Cannot push to registry ${dockerRegistryUrl}, because it was not found in the authenticated registry list.`
-  for (const dockerfile of dockerfileArray) {
+      );
-    await dockerfile.push(localDockerRegistry, suffix);
+      process.exit(1);
+    }
+    for (const dockerfile of dockerfileArray) {
+      await dockerfile.push(dockerRegistryToPushTo, suffix);
+    }
   }
 };
 
-export let pull = async argvArg => {
+export const pull = async argvArg => {
   await prepare();
   const registryUrlArg = argvArg._[2];
   let suffix = null;
@@ -139,7 +165,10 @@ export let pull = async argvArg => {
   }
 };
 
-export let test = async () => {
+/**
+ * tests docker files
+ */
+export const test = async () => {
   await prepare();
   return await helpers.readDockerfiles().then(helpers.testDockerfiles);
 };

ts/mod_docker/mod.classes.dockerfile.ts

@@ -42,9 +42,7 @@ export class Dockerfile {
   public async build() {
     logger.log('info', 'now building Dockerfile for ' + this.cleanTag);
     const buildArgsString = await helpers.getDockerBuildArgs();
-    const buildCommand = `docker build -t ${this.buildTag} -f ${
+    const buildCommand = `docker build -t ${this.buildTag} -f ${this.filePath} ${buildArgsString} .`;
-      this.filePath
-    } ${buildArgsString} .`;
     await bash(buildCommand);
     return;
   }
@@ -86,9 +84,7 @@ export class Dockerfile {
     if (testFileExists) {
       // run tests
       await bash(
-        `docker run --name npmci_test_container --entrypoint="bash" ${
+        `docker run --name npmci_test_container --entrypoint="bash" ${this.buildTag} -c "mkdir /npmci_test"`
-          this.buildTag
-        } -c "mkdir /npmci_test"`
       );
       await bash(`docker cp ${testFile} npmci_test_container:/npmci_test/test.sh`);
       await bash(`docker commit npmci_test_container npmci_test_image`);

ts/mod_git/index.ts

@@ -41,6 +41,9 @@ export let mirror = async () => {
   if (githubToken) {
     logger.log('info', 'found github token.');
     logger.log('info', 'attempting the mirror the repository to GitHub');
+
+    plugins.smartgit.GitRepo;
+
     // add the mirror
     await bash(
       `git remote add mirror https://${githubToken}@github.com/${githubUser}/${githubRepo}.git`

ts/mod_git/mod.plugins.ts

@@ -1 +1,5 @@
 export * from '../npmci.plugins';
+
+import * as smartgit from '@pushrocks/smartgit';
+
+export { smartgit };

ts/mod_node/index.ts

@@ -36,7 +36,7 @@ export let install = async versionArg => {
   logger.log('info', `now installing node version ${versionArg}`);
   let version: string;
   if (versionArg === 'stable') {
-    version = '11';
+    version = '12';
   } else if (versionArg === 'lts') {
     version = '10';
   } else if (versionArg === 'legacy') {

ts/mod_npm/index.ts

@@ -66,25 +66,48 @@ const prepare = async () => {
  * publish a package to npm
  */
 const publish = async () => {
-  let npmAccessCliString = ``;
+  const buildPublishCommand = async () => {
-  let npmRegistryCliString = ``;
+    let npmAccessCliString = ``;
-  const config = await configModule.getConfig();
+    let npmRegistryCliString = ``;
+    let publishVerdaccioAsWell = false;
+    const config = await configModule.getConfig();
+    const availableRegistries: string[] = [];
+    await plugins.smartparam.forEachMinimatch(process.env, 'NPMCI_TOKEN_NPM*', npmEnvArg => {
+      availableRegistries.push(npmEnvArg.split('|')[0]);
+    });
 
-  // -> configure package access level
+    // -> configure package access level
-  if (
+    if (config.npmAccessLevel) {
-    config.npmAccessLevel &&
+      npmAccessCliString = `--access=${config.npmAccessLevel}`;
-    (config.npmAccessLevel === 'public' || config.npmAccessLevel === 'private')
+      if (config.npmAccessLevel === 'public') {
-  ) {
+        publishVerdaccioAsWell = true;
-    npmAccessCliString = `--access=${config.npmAccessLevel}`;
+      }
-  }
+    }
+    // -> configure registry url
+    if (config.npmRegistryUrl) {
+      npmRegistryCliString = `--registry=https://${config.npmRegistryUrl}`;
+    } else {
+      logger.log('error', `no registry url specified. Can't publish!`);
+      process.exit(1);
+    }
 
-  // -> configure registry url
+    let publishCommand = `npm publish ${npmAccessCliString} ${npmRegistryCliString} `;
-  if (config.npmRegistryUrl) {
+
-    npmRegistryCliString = `--registry=https://${config.npmRegistryUrl}`;
+    // publishEverywhere
-  } else {
+    if (publishVerdaccioAsWell) {
-    logger.log('error', `no registry url specified. Can't publish!`);
+      const verdaccioRegistry = availableRegistries.find(registryString =>
-    process.exit(1);
+        registryString.startsWith('verdaccio')
-  }
+      );
+      if (verdaccioRegistry) {
+        logger.log(
+          'info',
+          `package is public and verdaccio registry is specified. Also publishing to Verdaccio!`
+        );
+        publishCommand = `${publishCommand} && npm publish ${npmAccessCliString} --registry=https://${verdaccioRegistry}`;
+      }
+    }
+    return publishCommand;
+  };
 
   // -> preparing
   logger.log('info', `now preparing environment:`);
@@ -105,7 +128,7 @@ const publish = async () => {
 
   // -> publish it
   logger.log('info', `now invoking npm to publish the package!`);
-  await bash(`npm publish ${npmAccessCliString} ${npmRegistryCliString}`);
+  await bash(await buildPublishCommand());
   logger.log('success', `Package was successfully published!`);
 };
 

ts/npmci.config.ts

@@ -5,13 +5,21 @@ import { repo } from './npmci.env';
 
 import { KeyValueStore } from '@pushrocks/npmextra';
 
+/**
+ * the main config interface for npmci
+ */
 export interface INpmciOptions {
   projectInfo: plugins.projectinfo.ProjectInfo;
+
+  // npm
   npmGlobalTools: string[];
   npmAccessLevel?: 'private' | 'public';
   npmRegistryUrl: string;
-  dockerRegistryRepoMap: any;
+
-  dockerBuildargEnvMap: any;
+  // docker
+  dockerRegistries: string[];
+  dockerRegistryRepoMap: { [key: string]: string };
+  dockerBuildargEnvMap: { [key: string]: string };
 }
 
 // instantiate a kvStorage for the current directory
@@ -22,6 +30,7 @@ const npmciNpmextra = new plugins.npmextra.Npmextra(paths.cwd);
 const defaultConfig: INpmciOptions = {
   projectInfo: new plugins.projectinfo.ProjectInfo(paths.cwd),
   npmGlobalTools: [],
+  dockerRegistries: [],
   dockerRegistryRepoMap: {},
   npmAccessLevel: 'private',
   npmRegistryUrl: 'registry.npmjs.org',

ts/npmci.plugins.ts

@@ -36,8 +36,6 @@ export {
   smartstring
 };
 
-// third party
-import * as lodash from 'lodash';
 import * as through2 from 'through2';
 
-export { lodash, through2 };
+export { through2 };