underpost 2.8.611 → 2.8.613

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

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.8.611",
+    "version": "2.8.613",
     "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

@@ -78,8 +78,17 @@ spec:
                   - -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}
+          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 +223,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: {
@@ -43,32 +46,33 @@ 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') {
+        let attempts = 0;
+        if (deployId === 'service') {
           const _deployId = UnderpostRootEnv.API.get('deploy-id');
           const _env = UnderpostRootEnv.API.get('deploy-env');
-          if (_deployId) {
+          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);
+            attempts++;
+            logger.info('Deploy env status attempt', attempts);
             return await UnderpostImage.API.dockerfile.script(deployId, env, 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`);

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.611';
+  static version = 'v2.8.613';
   /**
    * Repository cli API
    * @static