4.1.19

.gitea/workflows/default_nottags.yaml

@@ -7,10 +7,10 @@ on:
 
 env:
   IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-  NPMCI_TOKEN_NPM: $
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
-  NPMCI_TOKEN_NPM2: $
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
-  NPMCI_GIT_GITHUBTOKEN: $
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
-  NPMCI_URL_CLOUDLY: $
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
 
 jobs:
 

.gitea/workflows/default_tags.yaml

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipzone/npmci",
-  "version": "4.1.6",
+  "version": "4.1.19",
   "private": false,
   "description": "node and docker in gitlab ci on steroids",
   "main": "dist_ts/index.js",
@@ -26,37 +26,37 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmci#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.73",
+    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@pushrocks/tapbundle": "^5.0.8",
-    "@types/node": "^18.8.3"
+    "@types/node": "^20.3.1"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^2.0.10",
+    "@apiglobal/typedrequest": "^2.0.12",
-    "@pushrocks/lik": "^6.0.0",
+    "@pushrocks/lik": "^6.0.2",
     "@pushrocks/npmextra": "^3.0.9",
     "@pushrocks/projectinfo": "^5.0.1",
     "@pushrocks/qenv": "^5.0.2",
     "@pushrocks/smartanalytics": "^2.0.15",
     "@pushrocks/smartcli": "^4.0.6",
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartenv": "^5.0.3",
+    "@pushrocks/smartenv": "^5.0.5",
-    "@pushrocks/smartfile": "^10.0.5",
+    "@pushrocks/smartfile": "^10.0.25",
     "@pushrocks/smartgit": "^3.0.0",
-    "@pushrocks/smartlog": "^3.0.1",
+    "@pushrocks/smartlog": "^3.0.2",
-    "@pushrocks/smartlog-destination-local": "^8.0.8",
+    "@pushrocks/smartlog-destination-local": "^9.0.0",
     "@pushrocks/smartparam": "^1.1.6",
     "@pushrocks/smartpath": "^5.0.5",
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartrequest": "^2.0.11",
+    "@pushrocks/smartrequest": "^2.0.15",
-    "@pushrocks/smartshell": "^2.0.30",
+    "@pushrocks/smartshell": "^3.0.3",
-    "@pushrocks/smartsocket": "^2.0.7",
+    "@pushrocks/smartsocket": "^2.0.19",
     "@pushrocks/smartssh": "^2.0.0",
-    "@pushrocks/smartstring": "^4.0.5",
+    "@pushrocks/smartstring": "^4.0.7",
     "@servezone/interfaces": "^1.0.3",
-    "@tsclass/tsclass": "^4.0.21",
+    "@tsclass/tsclass": "^4.0.42",
-    "@types/through2": "^2.0.36",
+    "@types/through2": "^2.0.38",
     "through2": "^4.0.2"
   },
   "files": [

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.6',
+  version: '4.1.19',
   description: 'node and docker in gitlab ci on steroids'
 }

ts/manager.cloudron/index.ts

@@ -0,0 +1,68 @@
+import { logger } from '../npmci.logging.js';
+import * as plugins from './mod.plugins.js';
+import * as paths from '../npmci.paths.js';
+import { bash } from '../npmci.bash.js';
+import { Npmci } from '../npmci.classes.npmci.js';
+
+export class NpmciCloudronManager {
+  public npmciRef: Npmci;
+
+  constructor(npmciArg: Npmci) {
+    this.npmciRef = npmciArg;
+  }
+
+  /**
+   * handle cli input
+   * @param argvArg
+   */
+  public handleCli = async (argvArg: any) => {
+    if (argvArg._.length >= 2) {
+      const action: string = argvArg._[1];
+      switch (action) {
+        case 'deploy':
+          await this.deploy();
+          break;
+        default:
+          logger.log('error', `>>npmci cloudron ...<< action >>${action}<< not supported`);
+      }
+    } else {
+      logger.log(
+        'info',
+        `>>npmci cloudron ...<< cli arguments invalid... Please read the documentation.`
+      );
+    }
+  };
+
+  /**
+   * Replaces the version string in CloudronManifest file
+   * @param versionArg
+   */
+  public deploy = async () => {
+    logger.log('info', 'now deploying to cloudron...');
+    logger.log('info', 'installing cloudron cli...');
+    await bash(`pnpm install -g cloudron`);
+    logger.log('ok', 'cloudron cli installed');
+
+    // lets set the version in the CloudronManifest file
+    await this.prepareCloudronManifest(this.npmciRef.npmciConfig.getConfig().projectInfo.npm.version);
+    logger.log('ok', 'CloudronManifest prepared');
+
+    // lets figure out the docker image tag
+    const dockerfiles = await this.npmciRef.dockerManager.getDockerfiles();
+    const dockerImageTag = dockerfiles[0].pushTag;
+    const appName = this.npmciRef.npmciConfig.getConfig().cloudronAppName;
+    
+    const cloudronEnvVar = process.env.NPMCI_LOGIN_CLOUDRON;
+    const cloudronServer = cloudronEnvVar.split('|')[0];
+    const cloudronToken = cloudronEnvVar.split('|')[1];
+    await bash(`cloudron update --server ${cloudronServer} --token ${cloudronToken} --image ${dockerImageTag} --app ${appName}`);
+  };
+
+  private prepareCloudronManifest = async (versionArg: string) => {
+    const manifestPath = plugins.path.join(paths.cwd, 'CloudronManifest.json');
+    let manifestFile = plugins.smartfile.fs.toStringSync(manifestPath);
+    manifestFile = manifestFile.replace(/##version##/g, versionArg);
+    plugins.smartfile.memory.toFsSync(manifestFile, manifestPath);
+    logger.log('info', 'Version replaced in CloudronManifest file');
+  }
+}

ts/manager.cloudron/mod.plugins.ts

@@ -0,0 +1 @@
+export * from '../npmci.plugins.js';

ts/manager.docker/index.ts

@@ -77,8 +77,10 @@ export class NpmciDockerManager {
    */
   public prepare = async () => {
     // Always login to GitLab Registry
+    if (process.env.GITLAB_CI) {
+      console.log('gitlab ci detected');
       if (!process.env.CI_JOB_TOKEN || process.env.CI_JOB_TOKEN === '') {
-      logger.log('error', 'No registry token specified by gitlab!');
+        logger.log('error', 'Running in Gitlab CI, but no registry token specified by gitlab!');
         process.exit(1);
       }
       this.npmciRegistryStorage.addRegistry(
@@ -88,6 +90,7 @@ export class NpmciDockerManager {
           password: process.env.CI_JOB_TOKEN,
         })
       );
+    }
 
     // handle registries
     await plugins.smartparam.forEachMinimatch(
@@ -176,4 +179,12 @@ export class NpmciDockerManager {
     await this.prepare();
     return await Dockerfile.readDockerfiles(this).then(Dockerfile.testDockerfiles);
   };
+
+  /**
+   * can be used to get the Dockerfiles in the directory
+   */
+  getDockerfiles = async () => {
+    const dockerfiles = await Dockerfile.readDockerfiles(this);
+    return dockerfiles;
+  }
 }

ts/manager.docker/mod.classes.dockerfile.ts

@@ -120,15 +120,19 @@ export class Dockerfile {
    * returns a version for a docker file
    * @execution SYNC
    */
-  public static dockerFileVersion(dockerfileNameArg: string): string {
+  public static dockerFileVersion(dockerfileInstanceArg: Dockerfile, dockerfileNameArg: string): string {
     let versionString: string;
-    const versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
+    const versionRegex = /Dockerfile_([^:_]*)$/;
     const regexResultArray = versionRegex.exec(dockerfileNameArg);
     if (regexResultArray && regexResultArray.length === 2) {
       versionString = regexResultArray[1];
     } else {
       versionString = 'latest';
     }
+    versionString = versionString.replace(
+      '##version##',
+      dockerfileInstanceArg.npmciDockerManagerRef.npmciRef.npmciConfig.getConfig().projectInfo.npm.version
+    );
     return versionString;
   }
 
@@ -233,7 +237,7 @@ export class Dockerfile {
       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.user +
       '/' +
       this.npmciDockerManagerRef.npmciRef.npmciEnv.repo.repo;
-    this.version = Dockerfile.dockerFileVersion(plugins.path.parse(options.filePath).base);
+    this.version = Dockerfile.dockerFileVersion(this, plugins.path.parse(options.filePath).base);
     this.cleanTag = this.repo + ':' + this.version;
     this.buildTag = this.cleanTag;
 

ts/manager.docker/mod.classes.dockerregistry.ts

@@ -26,7 +26,7 @@ export class DockerRegistry {
       process.exit(1);
       return;
     }
-    const registryUrl = dockerRegexResultArray[0];
+    const registryUrl = dockerRegexResultArray[0].replace('https://', '').replace('http://', '');
     const username = dockerRegexResultArray[1];
     const password = dockerRegexResultArray[2];
     return new DockerRegistry({

ts/npmci.classes.npmci.ts

@@ -1,17 +1,21 @@
 import * as plugins from './npmci.plugins.js';
 
-import { CloudlyConnector } from './connector.cloudly/cloudlyconnector.js';
 
+// env
+import { NpmciEnv } from './npmci.classes.npmcienv.js';
 import { NpmciInfo } from './npmci.classes.npmciinfo.js';
 import { NpmciCli } from './npmci.classes.npmcicli.js';
 import { NpmciConfig } from './npmci.classes.npmciconfig.js';
 
-// mods
+// connectors
+import { CloudlyConnector } from './connector.cloudly/cloudlyconnector.js';
+
+// managers
+import { NpmciCloudronManager } from './manager.cloudron/index.js';
 import { NpmciDockerManager } from './manager.docker/index.js';
 import { NpmciGitManager } from './manager.git/index.js';
 import { NpmciNodeJsManager } from './manager.nodejs/index.js';
 import { NpmciNpmManager } from './manager.npm/index.js';
-import { NpmciEnv } from './npmci.classes.npmcienv.js';
 
 export class Npmci {
   public analytics: plugins.smartanalytics.Analytics;
@@ -23,6 +27,7 @@ export class Npmci {
   public npmciCli: NpmciCli;
 
   // managers
+  public cloudronManager: NpmciCloudronManager;
   public dockerManager: NpmciDockerManager;
   public gitManager: NpmciGitManager;
   public nodejsManager: NpmciNodeJsManager;
@@ -41,6 +46,7 @@ export class Npmci {
     this.npmciConfig = new NpmciConfig(this);
 
     // managers
+    this.cloudronManager = new NpmciCloudronManager(this);
     this.dockerManager = new NpmciDockerManager(this);
     this.gitManager = new NpmciGitManager(this);
     this.nodejsManager = new NpmciNodeJsManager(this);

ts/npmci.classes.npmcicli.ts

@@ -24,6 +24,17 @@ export class NpmciCli {
       }
     );
 
+    // cloudron
+    this.smartcli.addCommand('cloudron').subscribe(
+      async (argv) => {
+        await this.npmciRef.cloudronManager.handleCli(argv);
+      },
+      (err) => {
+        console.log(err);
+        process.exit(1);
+      }
+    );
+
     // command
     this.smartcli.addCommand('command').subscribe(
       async (argv) => {
@@ -36,7 +47,7 @@ export class NpmciCli {
       }
     );
 
-    // command
+    // git
     this.smartcli.addCommand('git').subscribe(
       async (argvArg) => {
         await this.npmciRef.gitManager.handleCli(argvArg);

ts/npmci.classes.npmciconfig.ts

@@ -25,6 +25,9 @@ export interface INpmciOptions {
 
   // urls
   urlCloudly: string;
+
+  // cloudron
+  cloudronAppName?: string;
 }
 
 /**

ts/npmci.classes.npmcienv.ts

@@ -9,7 +9,12 @@ export class NpmciEnv {
 
   constructor(npmciRefArg: Npmci) {
     this.npmciRef = npmciRefArg;
+    if (process.env.GITLAB_CI) {
       this.repoString = process.env.CI_REPOSITORY_URL;
+    }
+    if (process.env.NPMCI_COMPUTED_REPOURL) {
+      this.repoString = process.env.NPMCI_COMPUTED_REPOURL;
+    }
     if (!this.repoString) {
       this.repoString = 'https://undefined:undefined@github.com/undefined/undefined.git';
     }