3.1.37

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 # gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -50,13 +50,13 @@ testLTS:
   - 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "3.1.29",
+  "version": "3.1.37",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist/index.js",
@@ -40,6 +40,7 @@
     "@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": "^8.0.2",
     "@pushrocks/smartparam": "^1.0.4",
@@ -58,6 +59,7 @@
     "ts_web/*",
     "dist/*",
     "dist_web/*",
+    "dist_ts_web/*",
     "assets/*",
     "cli.js",
     "npmextra.json",

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];
   }
+
+  // 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 +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_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_npm/index.ts

@@ -66,18 +66,25 @@ const prepare = async () => {
  * publish a package to npm
  */
 const publish = async () => {
+  const buildPublishCommand = async () => {
     let npmAccessCliString = ``;
     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
-  if (
+    if (config.npmAccessLevel) {
-    config.npmAccessLevel &&
-    (config.npmAccessLevel === 'public' || config.npmAccessLevel === 'private')
-  ) {
       npmAccessCliString = `--access=${config.npmAccessLevel}`;
+      if (config.npmAccessLevel === 'public') {
+        publishVerdaccioAsWell = true;
+      }
+    } else {
+      throw new Error('You need to set a npmAccessLevel!!!');
     }
-
     // -> configure registry url
     if (config.npmRegistryUrl) {
       npmRegistryCliString = `--registry=https://${config.npmRegistryUrl}`;
@@ -86,6 +93,29 @@ const publish = async () => {
       process.exit(1);
     }
 
+    let publishCommand = `npm publish ${npmAccessCliString} ${npmRegistryCliString} `;
+
+    // publishEverywhere
+    if (publishVerdaccioAsWell) {
+      const verdaccioRegistry = availableRegistries.find(registryString =>
+        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}`;
+      } else {
+        logger.log(
+          'error',
+          `This package should also be published to Verdaccio, however there is no Verdaccio registry data available!`
+        );
+      }
+    }
+    return publishCommand;
+  };
+
   // -> preparing
   logger.log('info', `now preparing environment:`);
   prepare();
@@ -105,7 +135,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',