underpost 2.8.61 → 2.8.62

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.61'
+      engine.version: '2.8.62'
     networks:
       - load-balancer
 

package/package.json

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

package/src/cli/db.js

@@ -155,9 +155,9 @@ class UnderpostDB {
                       if (options.collections)
                         for (const collection of options.collections)
                           shellExec(
-                            `sudo kubectl exec -i ${podName} -- sh -c "mongodump -d ${dbName} --collection ${collection} -o /${dbName}"`,
+                            `sudo kubectl exec -i ${podName} -- sh -c "mongodump -d ${dbName} --collection ${collection} -o /"`,
                           );
-                      else shellExec(`sudo kubectl exec -i ${podName} -- sh -c "mongodump -d ${dbName} -o /${dbName}"`);
+                      else shellExec(`sudo kubectl exec -i ${podName} -- sh -c "mongodump -d ${dbName} -o /"`);
                       shellExec(
                         `sudo kubectl cp ${nameSpace}/${podName}:/${dbName} ${
                           options.outPath ? options.outPath : _toNewBsonPath

package/src/cli/deploy.js

@@ -50,7 +50,7 @@ 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}`;
         const deploymentYamlParts = `apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -69,7 +69,12 @@ spec:
     spec:
       containers:
         - name: ${deployId}-${env}
-          image: localhost/underpost-engine:${version && typeof version === 'string' ? version : Underpost.version}
+          image: localhost/debian:underpost
+          command:
+            - /bin/sh
+            - -c
+            - >
+              underpost dockerfile-node-script --build --run ${deployId} ${env}
           lifecycle:
             postStart:
               exec:
@@ -77,9 +82,16 @@ spec:
                   - /bin/sh
                   - -c
                   - >
-                    sleep 60 &&
-                    underpost config set deploy-id ${deployId} &&
-                    underpost config set deploy-env ${env}
+                    sleep 20 &&
+                    npm install -g underpost
+                    underpost secret underpost --create-from-file /etc/config/.env.${env}
+          volumeMounts:
+            - name: config-volume
+              mountPath: /etc/config
+      volumes:
+        - name: config-volume
+          configMap:
+            name: underpost-config
 # image: localhost/${deployId}-${env}:${version && typeof version === 'string' ? version : Underpost.version}
 ---
 apiVersion: v1
@@ -214,6 +226,10 @@ kubectl scale statefulsets <stateful-set-name> --replicas=<new-replicas>
       if (options.buildManifest === true) await UnderpostDeploy.API.buildManifest(deployList, env, options.version);
       if (options.infoRouter === true)
         return logger.info('router', await UnderpostDeploy.API.routerFactory(deployList, env));
+      shellExec(`kubectl delete configmap underpost-config`);
+      shellExec(
+        `kubectl create configmap underpost-config --from-file=/home/dd/engine/engine-private/conf/dd-cron/.env.${env}`,
+      );
       const etcHost = (
         concat,
       ) => `127.0.0.1  ${concat} localhost localhost.localdomain localhost4 localhost4.localdomain4

package/src/cli/env.js

@@ -28,15 +28,21 @@ 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('underpost root', { [key]: env[key] });
+      logger.info(`${key}(${typeof env[key]})`, env[key]);
       return env[key];
     },
     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`;
@@ -43,52 +46,29 @@ class UnderpostImage {
         }
         // --rm --no-cache
         if (options.imageArchive !== true) {
-          fs.copyFile(`${getNpmRootPath()}/underpost/.env`, `${path}/.env.underpost`);
           shellExec(
             `cd ${path}${secrets}&& sudo podman build -f ./Dockerfile -t ${imgName} --pull=never --cap-add=CAP_AUDIT_WRITE${secretDockerInput}`,
           );
-          fs.removeSync(`${path}/.env.underpost`);
         }
         if (options.imageArchive !== true || options.podmanSave === true)
           shellExec(`cd ${path} && podman save -o ${tarFile} ${podManImg}`);
         shellExec(`cd ${path} && sudo kind load image-archive ${tarFile}`);
       },
       async script(deployId = 'default', env = 'development', options = { run: false, build: false }) {
-        if (deployId === 'deploy') {
-          const _deployId = UnderpostRootEnv.API.get('deploy-id');
-          const _env = UnderpostRootEnv.API.get('deploy-env');
-          const _path = UnderpostRootEnv.API.get('deploy-path');
-          if (_deployId) {
-            deployId = _deployId;
-            if (_env) env = _env;
-            if (_path) path = _path;
-          } else {
-            await timer(30 * 1000);
-            return await UnderpostImage.API.script(deployId, env, path, options);
-          }
-        }
         if (options.build === true) {
           const buildBasePath = `/home/dd`;
           const repoName = `engine-${deployId.split('-')[1]}`;
-          fs.mkdirSync(buildBasePath, { recursive: true });
           shellExec(`cd ${buildBasePath} && underpost clone underpostnet/${repoName}`);
           shellExec(`cd ${buildBasePath} && sudo mv ./${repoName} ./engine`);
           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`);
+          shellExec(`underpost install`);
           const itcScripts = 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:
             {
               {
@@ -129,7 +109,7 @@ class UnderpostImage {
             const replicas = await fs.readdir(`./engine-private/replica`);
             for (const replica of replicas) {
               shellExec(`node bin/deploy conf ${replica} ${env}`);
-              shellExec(`npm ${runCmd} ${replica} deploy`, { async: true });
+              shellExec(`npm ${runCmd} deploy deploy-id:${replica}`, { async: true });
               fs.writeFileSync(`./tmp/await-deploy`, '', 'utf8');
               const monitor = async () => {
                 await timer(1000);
@@ -139,7 +119,7 @@ class UnderpostImage {
             }
             shellExec(`node bin/deploy conf ${deployId} ${env}`);
           }
-          shellExec(`npm ${runCmd} ${deployId} deploy`);
+          shellExec(`npm ${runCmd} deploy deploy-id:${deployId}`);
         }
       },
     },

package/src/client/components/core/Modal.js

@@ -1157,7 +1157,7 @@ const Modal = {
           top: ${top};
           left: ${left};
           overflow: auto; /* resizable required */
-          resize: auto; /* resizable required */
+          resize: both; /* resizable required */
           transition: ${transition};
           opacity: 0;
           z-index: 1;

package/src/index.js

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