4.1.11

.gitea/workflows/default_tags.yaml

@@ -9,6 +9,7 @@ env:
   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
   NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_LOGIN_DOCKER_GITEA: ${{secrets.NPMCI_DOCKER_REGISTRYURL_DEFAULT}}|${{ gitea.repository_owner }}|${{ secrets.GITEA_TOKEN }}
 
 jobs:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "4.1.9",
+  "version": "4.1.11",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist_ts/index.js",

test/test.ts

@@ -21,6 +21,8 @@ process.cwd = () => {
 
 let npmci: typeof import('../ts/index.js');
 
+type TNpmciTypes = typeof import('../ts/index.js');
+
 tap.preTask('should import npmci', async () => {
   npmci = await import('../ts/index.js');
 });

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@shipzone/npmci',
-  version: '4.1.9',
+  version: '4.1.11',
   description: 'node and docker in gitlab ci on steroids'
 }

ts/manager.docker/index.ts

@@ -77,17 +77,20 @@ export class NpmciDockerManager {
    */
   public prepare = async () => {
     // Always login to GitLab Registry
-    if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') {
+    if (process.env.GITLAB_CI) {
-      logger.log('error', 'No registry token specified by gitlab!');
+      console.log('gitlab ci detected');
-      process.exit(1);
+      if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') {
+        logger.log('error', 'Running in Gitlab CI, but no registry token specified by gitlab!');
+        process.exit(1);
+      }
+      this.npmciRegistryStorage.addRegistry(
+        new DockerRegistry({
+          registryUrl: 'registry.gitlab.com',
+          username: 'gitlab-ci-token',
+          password: process.env.CI_JOB_TOKEN,
+        })
+      );
     }
-    this.npmciRegistryStorage.addRegistry(
-      new DockerRegistry({
-        registryUrl: 'registry.gitlab.com',
-        username: 'gitlab-ci-token',
-        password: process.env.CI_JOB_TOKEN,
-      })
-    );
 
     // handle registries
     await plugins.smartparam.forEachMinimatch(