3.1.32

.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,4 +1,4 @@
-# gitzone standard
+# gitzone ci_default
 image: hosttoday/ht-docker-node:npmci
 
 cache:
@@ -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.26",
+  "version": "3.1.32",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
@@ -26,31 +26,41 @@
   "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/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/shelljs": "^0.8.5",
     "@types/through2": "^2.0.34",
     "through2": "^3.0.1"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_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,51 @@ 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];
   }
+
+  // lets push to the registries
+  for (const dockerRegistryUrl of dockerRegistryUrls) {
     const dockerfileArray = await helpers
       .readDockerfiles()
       .then(helpers.sortDockerfiles)
       .then(helpers.mapDockerfiles);
-  const localDockerRegistry = npmciRegistryStorage.getRegistryByUrl(registryUrlArg);
+    const dockerRegistryToPushTo = npmciRegistryStorage.getRegistryByUrl(dockerRegistryUrl);
-  if (!localDockerRegistry) {
+    if (!dockerRegistryToPushTo) {
       logger.log(
         'error',
-      `Cannot push to registry ${registryUrlArg}, because it was not found in the authenticated registry list.`
+        `Cannot push to registry ${dockerRegistryUrl}, because it was not found in the authenticated registry list.`
       );
       process.exit(1);
     }
     for (const dockerfile of dockerfileArray) {
-    await dockerfile.push(localDockerRegistry, suffix);
+      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 +162,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/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',