underpost 2.8.612 → 2.8.621

package/bin/deploy.js

@@ -673,8 +673,8 @@ try {
     }
 
     case 'version-build': {
-      const newVersion = process.argv[3];
       const originPackageJson = JSON.parse(fs.readFileSync(`package.json`, 'utf8'));
+      const newVersion = process.argv[3] ?? originPackageJson.version;
       const { version } = originPackageJson;
       originPackageJson.version = newVersion;
       fs.writeFileSync(`package.json`, JSON.stringify(originPackageJson, null, 4), 'utf8');

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.8.612'
+      engine.version: '2.8.621'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.612",
+    "version": "2.8.621",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/cli/deploy.js

@@ -50,7 +50,17 @@ class UnderpostDeploy {
         if (env === 'development') fs.mkdirSync(`./manifests/deployment/${deployId}-${env}`, { recursive: true });
 
         logger.info('port range', { deployId, fromPort, toPort });
-
+        // const customImg = `underpost-engine:${version && typeof version === 'string' ? version : Underpost.version}`;
+        // lifecycle:
+        // postStart:
+        //   exec:
+        //     command:
+        //       - /bin/sh
+        //       - -c
+        //       - >
+        //         sleep 20 &&
+        //         npm install -g underpost &&
+        //         underpost secret underpost --create-from-file /etc/config/.env.${env}
         const deploymentYamlParts = `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -69,19 +79,19 @@ spec:
     spec:
       containers:
         - name: ${deployId}-${env}
-          image: localhost/underpost-engine:${version && typeof version === 'string' ? version : Underpost.version}
-          lifecycle:
-            postStart:
-              exec:
-                command:
-                  - /bin/sh
-                  - -c
-                  - >
-                    sleep 60 &&
-                    npm install -g underpost
-                    underpost secret underpost --create-from-file /etc/config/.env.${env}
-                    underpost config set deploy-id ${deployId} &&
-                    underpost config set deploy-env ${env}
+          image: localhost/debian:underpost
+          command:
+            - /bin/sh
+            - -c
+            - >
+              npm install -g npm@11.2.0 &&
+              npm config delete proxy &&
+              npm config delete http-proxy &&
+              npm config delete https-proxy &&
+              npm config set registry http://registry.npmjs.org/ &&
+              npm install --unsafe-perm --ignore-scripts -g underpost &&
+              underpost secret underpost --create-from-file /etc/config/.env.${env} &&
+              underpost dockerfile-node-script --build --run ${deployId} ${env}
           volumeMounts:
             - name: config-volume
               mountPath: /etc/config

package/src/cli/env.js

@@ -28,7 +28,10 @@ class UnderpostRootEnv {
     get(key) {
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
-      if (!fs.existsSync(envPath)) return logger.error(`Unable to find underpost root environment`);
+      if (!fs.existsSync(envPath)) {
+        logger.error(`Unable to find underpost root environment`);
+        return undefined;
+      }
       const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
       logger.info(`${key}(${typeof env[key]})`, env[key]);
       return env[key];
@@ -36,7 +39,10 @@ class UnderpostRootEnv {
     list() {
       const exeRootPath = `${getNpmRootPath()}/underpost`;
       const envPath = `${exeRootPath}/.env`;
-      if (!fs.existsSync(envPath)) return logger.error(`Unable to find underpost root environment`);
+      if (!fs.existsSync(envPath)) {
+        logger.error(`Unable to find underpost root environment`);
+        return {};
+      }
       const env = dotenv.parse(fs.readFileSync(envPath, 'utf8'));
       logger.info('underpost root', env);
       return env;

package/src/cli/image.js

@@ -5,9 +5,12 @@ import dotenv from 'dotenv';
 import { getNpmRootPath } from '../server/conf.js';
 import { timer } from '../client/components/core/CommonJs.js';
 import UnderpostRootEnv from './env.js';
+import { loggerFactory } from '../server/logger.js';
 
 dotenv.config();
 
+const logger = loggerFactory(import.meta);
+
 class UnderpostImage {
   static API = {
     dockerfile: {
@@ -23,7 +26,7 @@ class UnderpostImage {
         const imgName = `${
           options.imageName && typeof options.imageName === 'string' ? options.imageName : `${deployId}-${env}`
         }:${
-          options.imageVersion && typeof options.imageVersions === 'string' ? options.imageVersion : Underpost.version
+          options.imageVersion && typeof options.imageVersion === 'string' ? options.imageVersion : Underpost.version
         }`;
         const podManImg = `localhost/${imgName}`;
         const imagesStoragePath = `/images`;
@@ -52,18 +55,6 @@ class UnderpostImage {
         shellExec(`cd ${path} && sudo kind load image-archive ${tarFile}`);
       },
       async script(deployId = 'default', env = 'development', options = { run: false, build: false }) {
-        if (deployId === 'service') {
-          const _deployId = UnderpostRootEnv.API.get('deploy-id');
-          const _env = UnderpostRootEnv.API.get('deploy-env');
-          process.env.GITHUB_TOKEN = UnderpostRootEnv.API.get('GITHUB_TOKEN');
-          if (_deployId && process.env.GITHUB_TOKEN) {
-            deployId = _deployId;
-            if (_env) env = _env;
-          } else {
-            await timer(30 * 1000);
-            return await UnderpostImage.API.dockerfile.script(deployId, env, options);
-          }
-        }
         if (options.build === true) {
           const buildBasePath = `/home/dd`;
           const repoName = `engine-${deployId.split('-')[1]}`;
@@ -72,19 +63,12 @@ class UnderpostImage {
           shellExec(`cd ${buildBasePath}/engine && underpost clone underpostnet/${repoName}-private`);
           shellExec(`cd ${buildBasePath}/engine && sudo mv ./${repoName}-private ./engine-private`);
           shellCd(`${buildBasePath}/engine`);
-          shellExec(`npm install`);
-          const itcScripts = fs.readdir('./engine-private/itc-scripts');
+          shellExec(`underpost install`);
+          const itcScripts = await fs.readdir('./engine-private/itc-scripts');
           for (const itcScript of itcScripts)
             if (itcScript.match(deployId)) shellExec(`node ./engine-private/itc-scripts/${itcScript}`);
         }
         switch (deployId) {
-          case 'dd-lampp':
-            {
-              const lamppPublicPath = '/xampp/htdocs/online';
-              shellExec(`sudo mkdir -p ${lamppPublicPath}`);
-            }
-            break;
-
           default:
             {
               {

package/src/index.js

@@ -28,7 +28,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.612';
+  static version = 'v2.8.621';
   /**
    * Repository cli API
    * @static