underpost 2.8.839 → 2.8.841

package/README.md

@@ -26,10 +26,12 @@ template
 
 
 
+
+
 <!-- badges -->
 
 
-[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.839)](https://socket.dev/npm/package/underpost/overview/2.8.839) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
+[![Node.js CI](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/docker-image.yml) [![Test](https://github.com/underpostnet/engine/actions/workflows/coverall.yml/badge.svg?branch=master)](https://github.com/underpostnet/engine/actions/workflows/coverall.yml) [![Downloads](https://img.shields.io/npm/dm/underpost.svg)](https://www.npmjs.com/package/underpost) [![Socket Badge](https://socket.dev/api/badge/npm/package/underpost/2.8.841)](https://socket.dev/npm/package/underpost/overview/2.8.841) [![Coverage Status](https://coveralls.io/repos/github/underpostnet/engine/badge.svg?branch=master)](https://coveralls.io/github/underpostnet/engine?branch=master) [![Version](https://img.shields.io/npm/v/underpost.svg)](https://www.npmjs.org/package/underpost) [![License](https://img.shields.io/npm/l/underpost.svg)](https://www.npmjs.com/package/underpost)
 
 
 <!-- end-badges -->
@@ -38,6 +40,8 @@ template
 
 
 
+
+
 </div>
 
 <div align="center">
@@ -82,7 +86,7 @@ Run dev client server
 npm run dev
 ```
 <!-- -->
-## underpost ci/cd cli v2.8.839
+## underpost ci/cd cli v2.8.841
 
 ### Usage: `underpost [options] [command]`
   ```

package/cli.md

@@ -1,4 +1,4 @@
-## underpost ci/cd cli v2.8.839
+## underpost ci/cd cli v2.8.8411
 
 ### Usage: `underpost [options] [command]`
   ```
@@ -554,7 +554,7 @@ Options:
 Runs a script from the specified path.
 
 Arguments:
-  runner-id                                The runner ID to run. Options: spark-template, gpu-env, tf-gpu-test, ide, monitor, tf-vae-test, deploy-job.
+  runner-id                                The runner ID to run. Options: spark-template, rmi, kill, secret, gpu-env, tf-gpu-test, ide, monitor, tf-vae-test, deploy-job.
   path                                     The absolute or relative directory path where the script is located.
 
 Options:

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

package/manifests/deployment/dd-template-development/deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-blue
-          image: localhost/rockylinux9-underpost:v2.8.839
+          image: localhost/rockylinux9-underpost:v2.8.841
           #          resources:
           #            requests:
           #              memory: "124Ki"
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: dd-template-development-green
-          image: localhost/rockylinux9-underpost:v2.8.839
+          image: localhost/rockylinux9-underpost:v2.8.841
           #          resources:
           #            requests:
           #              memory: "124Ki"

package/package.json

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

package/src/cli/cluster.js

@@ -260,12 +260,12 @@ class UnderpostCluster {
 
       if (options.full === true || options.valkey === true) {
         if (options.pullImage === true) {
-          shellExec(`docker pull valkey/valkey:latest`);
-          shellExec(`sudo podman pull valkey/valkey:latest`);
-          if (!options.kubeadm && !options.k3s)
+          // shellExec(`sudo podman pull valkey/valkey:latest`);
+          if (!options.kubeadm && !options.k3s) {
             // Only load if not kubeadm/k3s (Kind needs it)
+            shellExec(`docker pull valkey/valkey:latest`);
             shellExec(`sudo kind load docker-image valkey/valkey:latest`);
-          else if (options.kubeadm || options.k3s)
+          } else if (options.kubeadm || options.k3s)
             // For kubeadm/k3s, ensure it's available for containerd
             shellExec(`sudo crictl pull valkey/valkey:latest`);
         }
@@ -279,12 +279,12 @@ class UnderpostCluster {
         shellExec(`kubectl delete statefulset mariadb-statefulset --ignore-not-found`);
 
         if (options.pullImage === true) {
-          shellExec(`docker pull mariadb:latest`);
-          shellExec(`sudo podman pull mariadb:latest`);
-          if (!options.kubeadm && !options.k3s)
+          // shellExec(`sudo podman pull mariadb:latest`);
+          if (!options.kubeadm && !options.k3s) {
             // Only load if not kubeadm/k3s (Kind needs it)
+            shellExec(`docker pull mariadb:latest`);
             shellExec(`sudo kind load docker-image mariadb:latest`);
-          else if (options.kubeadm || options.k3s)
+          } else if (options.kubeadm || options.k3s)
             // For kubeadm/k3s, ensure it's available for containerd
             shellExec(`sudo crictl pull mariadb:latest`);
         }
@@ -304,11 +304,11 @@ class UnderpostCluster {
       }
       if (options.full === true || options.postgresql === true) {
         if (options.pullImage === true) {
-          shellExec(`docker pull postgres:latest`);
-          if (!options.kubeadm && !options.k3s)
+          if (!options.kubeadm && !options.k3s) {
             // Only load if not kubeadm/k3s (Kind needs it)
+            shellExec(`docker pull postgres:latest`);
             shellExec(`sudo kind load docker-image postgres:latest`);
-          else if (options.kubeadm || options.k3s)
+          } else if (options.kubeadm || options.k3s)
             // For kubeadm/k3s, ensure it's available for containerd
             shellExec(`sudo crictl pull postgres:latest`);
         }
@@ -319,11 +319,11 @@ class UnderpostCluster {
       }
       if (options.mongodb4 === true) {
         if (options.pullImage === true) {
-          shellExec(`docker pull mongo:4.4`);
-          if (!options.kubeadm && !options.k3s)
+          if (!options.kubeadm && !options.k3s) {
             // Only load if not kubeadm/k3s (Kind needs it)
+            shellExec(`docker pull mongo:4.4`);
             shellExec(`sudo kind load docker-image mongo:4.4`);
-          else if (options.kubeadm || options.k3s)
+          } else if (options.kubeadm || options.k3s)
             // For kubeadm/k3s, ensure it's available for containerd
             shellExec(`sudo crictl pull mongo:4.4`);
         }
@@ -348,11 +348,11 @@ class UnderpostCluster {
         }
       } else if (options.full === true || options.mongodb === true) {
         if (options.pullImage === true) {
-          shellExec(`docker pull mongo:latest`);
-          if (!options.kubeadm && !options.k3s)
+          if (!options.kubeadm && !options.k3s) {
             // Only load if not kubeadm/k3s (Kind needs it)
+            shellExec(`docker pull mongo:latest`);
             shellExec(`sudo kind load docker-image mongo:latest`);
-          else if (options.kubeadm || options.k3s)
+          } else if (options.kubeadm || options.k3s)
             // For kubeadm/k3s, ensure it's available for containerd
             shellExec(`sudo crictl pull mongo:latest`);
         }
@@ -425,7 +425,7 @@ class UnderpostCluster {
      * @param {string} underpostRoot - The root directory of the underpost project.
      */
     config(options = { underpostRoot: '.' }) {
-      const underpostRoot = options;
+      const { underpostRoot } = options;
       console.log('Applying host configuration: SELinux, Docker, Containerd, and Sysctl settings.');
       // Disable SELinux (permissive mode)
       shellExec(`sudo setenforce 0`);
@@ -460,10 +460,13 @@ class UnderpostCluster {
         `/etc/sysctl.d/99-k8s-ipforward.conf`,
         `/etc/sysctl.d/99-k8s.conf`,
       ])
-        shellExec(`echo 'net.bridge.bridge-nf-call-iptables = 1
+        shellExec(
+          `echo 'net.bridge.bridge-nf-call-iptables = 1
 net.bridge.bridge-nf-call-ip6tables = 1
 net.bridge.bridge-nf-call-arptables = 1
-net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`);
+net.ipv4.ip_forward = 1' | sudo tee ${iptableConfPath}`,
+          { silent: true },
+        );
       // shellExec(`sudo sysctl --system`); // Apply sysctl changes immediately
       // Apply NAT iptables rules.
       shellExec(`${underpostRoot}/manifests/maas/nat-iptables.sh`, { silent: true });

package/src/cli/run.js

@@ -6,6 +6,7 @@ import UnderpostTest from './test.js';
 import fs from 'fs-extra';
 import { range, setPad, timer } from '../client/components/core/CommonJs.js';
 import UnderpostDeploy from './deploy.js';
+import UnderpostRootEnv from './env.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -40,6 +41,19 @@ class UnderpostRun {
 
       shellCd('/home/dd/engine');
     },
+    rmi: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(`podman rmi $(podman images -qa) --force`);
+    },
+    kill: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(`sudo kill -9 $(lsof -t -i:${path})`);
+    },
+    secret: (path, options = UnderpostRun.DEFAULT_OPTION) => {
+      shellExec(
+        `underpost secret underpost --create-from-file ${
+          path ? path : `/home/dd/engine/engine-private/conf/dd-cron/.env.production`
+        }`,
+      );
+    },
     'gpu-env': (path, options = UnderpostRun.DEFAULT_OPTION) => {
       shellExec(
         `node bin cluster --dev --reset && node bin cluster --dev --dedicated-gpu --kubeadm && kubectl get pods --all-namespaces -o wide -w`,
@@ -174,6 +188,12 @@ class UnderpostRun {
       const volumeHostPath = options.volumeHostPath || path;
       const enableVolumeMount = volumeHostPath && volumeMountPath;
 
+      if (options.volumeType === 'dev') options.volumeType = 'FileOrCreate';
+      const volumeType =
+        options.volumeType || (enableVolumeMount && fs.statSync(volumeHostPath).isDirectory()) ? 'Directory' : 'File';
+
+      const envs = UnderpostRootEnv.API.list();
+
       const cmd = `kubectl apply -f - <<EOF
 apiVersion: v1
 kind: Pod
@@ -197,16 +217,19 @@ ${
 ${args.map((arg) => `          ${arg}`).join('\n')}`
     : ''
 }
-${
+${`${
   gpuEnable
     ? `      resources:
         limits:
           nvidia.com/gpu: '1'
-      env:
-        - name: NVIDIA_VISIBLE_DEVICES
-          value: all`
+`
     : ''
-}
+}      env:
+${Object.keys(envs)
+  .map((key) => ({ key, value: typeof envs[key] === 'number' ? envs[key] : `"${envs[key]}"` }))
+  .concat(gpuEnable ? [{ key: 'NVIDIA_VISIBLE_DEVICES', value: 'all' }] : [])
+  .map((env) => `        - name: ${env.key}\n          value: ${env.value}`)
+  .join('\n')}`}
 ${
   enableVolumeMount
     ? `
@@ -217,7 +240,7 @@ ${
     - name: ${volumeName}
       hostPath:
         path: ${volumeHostPath}
-        type: ${fs.statSync(volumeHostPath).isDirectory() ? 'Directory' : 'File'}`
+        type: ${volumeType}`
     : ''
 }
 EOF`;

package/src/index.js

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

package/src/runtime/lampp/Dockerfile

@@ -1,43 +1,35 @@
 FROM rockylinux:9
 
-RUN dnf install -y --allowerasing bzip2
-
-RUN dnf update -y
-RUN dnf install -y epel-release
-RUN dnf install -y --allowerasing sudo
-RUN dnf install -y --allowerasing curl
-RUN dnf install -y --allowerasing net-tools
-RUN dnf install -y --allowerasing openssh-server
-RUN dnf install -y --allowerasing nano
-RUN dnf install -y --allowerasing vim-enhanced
-RUN dnf install -y --allowerasing less
-RUN dnf install -y --allowerasing openssl-devel
-RUN dnf install -y --allowerasing wget
-RUN dnf install -y --allowerasing git
-RUN dnf install -y --allowerasing gnupg2
-RUN dnf clean all
-
-# Install LAMPP (XAMPP)
-# Download the XAMPP installer for Linux
-RUN curl -Lo xampp-linux-installer.run https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.33/xampp-linux-x64-7.4.33-0-installer.run?from_af=true
-RUN chmod +x xampp-linux-installer.run
-# Run the XAMPP installer in silent mode
-RUN bash -c './xampp-linux-installer.run --mode unattended'
-# Create a symbolic link for easy access to lampp command
-RUN ln -sf /opt/lampp/lampp /usr/bin/lampp
-
-# Configure XAMPP
-# Enable XAMPP web interface (remove security checks)
-RUN sed -i.bak 's/Require local/Require all granted/g' /opt/lampp/etc/extra/httpd-xampp.conf
-# Enable error display in php
-RUN sed -i.bak 's/display_errors=Off/display_errors=On/g' /opt/lampp/etc/php.ini
-# Enable includes of several configuration files for Apache
-RUN mkdir -p /opt/lampp/apache2/conf.d
-RUN echo "IncludeOptional /opt/lampp/apache2/conf.d/*.conf" >>/opt/lampp/etc/httpd.conf
-# Create a /www folder and a symbolic link to it in /opt/lampp/htdocs
-# This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools
-RUN mkdir /www
-RUN ln -s /www /opt/lampp/htdocs
+# --- Update and install required packages
+RUN dnf -y update && \
+    dnf -y install epel-release && \
+    dnf -y install --allowerasing \
+        bzip2 \
+        sudo \
+        curl \
+        net-tools \
+        openssh-server \
+        nano \
+        vim-enhanced \
+        less \
+        openssl-devel \
+        wget \
+        git \
+        gnupg2 \
+        libnsl \
+        perl && \
+    dnf clean all
+
+# --- Download and install XAMPP
+RUN curl -L -o /tmp/xampp-linux-installer.run "https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/7.4.33/xampp-linux-x64-7.4.33-0-installer.run" && \
+    chmod +x /tmp/xampp-linux-installer.run && \
+    bash -c "/tmp/xampp-linux-installer.run --mode unattended" && \
+    ln -sf /opt/lampp/lampp /usr/bin/lampp
+
+# --- Create /xampp/htdocs (static root) and set permissions
+RUN mkdir -p /opt/lampp/htdocs && \
+    chown -R root:root /opt/lampp/htdocs && \
+    chmod -R a+rX /opt/lampp/htdocs
 
 # Install Node.js
 RUN curl -fsSL https://rpm.nodesource.com/setup_23.x | bash -
@@ -51,7 +43,6 @@ RUN npm --version
 # Set working directory
 WORKDIR /home/dd
 
-# Expose necessary ports
 EXPOSE 22
 EXPOSE 80
 EXPOSE 443

package/src/runtime/lampp/Lampp.js

@@ -10,7 +10,16 @@ const Lampp = {
   initService: async function (options = { daemon: false }) {
     let cmd;
     // linux
-    fs.writeFileSync(`/opt/lampp/apache2/conf/httpd.conf`, this.router || '', 'utf8');
+    // /opt/lampp/apache2/conf/httpd.conf
+    fs.writeFileSync(`/opt/lampp/etc/extra/httpd-vhosts.conf`, this.router || '', 'utf8');
+    fs.writeFileSync(
+      `/opt/lampp/etc/httpd.conf`,
+      fs
+        .readFileSync(`/opt/lampp/etc/httpd.conf`, 'utf8')
+        .replace(`#Include etc/extra/httpd-vhosts.conf`, `Include etc/extra/httpd-vhosts.conf`),
+      'utf8',
+    );
+
     cmd = `sudo /opt/lampp/lampp stop`;
     if (!fs.readFileSync(`/opt/lampp/etc/httpd.conf`, 'utf8').match(`# Listen 80`))
       fs.writeFileSync(
@@ -42,7 +51,7 @@ const Lampp = {
     if (this.router) fs.writeFileSync(`./tmp/lampp-router.conf`, this.router, 'utf-8');
     shellExec(cmd);
   },
-  enabled: () => fs.existsSync(`/opt/lampp/apache2/conf/httpd.conf`),
+  enabled: () => fs.existsSync(`/opt/lampp/etc/httpd.conf`),
   appendRouter: function (render) {
     if (!this.router) {
       if (fs.existsSync(`./tmp/lampp-router.conf`))