underpost 2.8.798 → 2.8.811

package/src/cli/lxd.js

@@ -43,7 +43,7 @@ class UnderpostLxd {
         createAdminProfile: false,
         control: false,
         worker: false,
-        k3s: false, // New k3s option
+        k3s: false,
         initVm: '',
         createVm: '',
         infoVm: '',
@@ -96,7 +96,6 @@ ipv6.address=none`);
         let flag = '';
         if (options.control === true) {
           if (options.k3s === true) {
-            // New K3s flag for control plane
             flag = ' -s -- --k3s';
           } else {
             // Default to kubeadm if not K3s
@@ -107,7 +106,6 @@ ipv6.address=none`);
           shellExec(`lxc file push /home/dd/engine/manifests ${options.initVm}/home/dd/engine --recursive`);
         } else if (options.worker == true) {
           if (options.k3s === true) {
-            // New K3s flag for worker
             flag = ' -s -- --worker --k3s';
           } else {
             // Default to kubeadm worker
@@ -263,7 +261,6 @@ ipv6.address=none`);
         }
       }
 
-      // New 'test' option implementation
       if (options.test && typeof options.test === 'string') {
         const vmName = options.test;
         console.log(`Starting comprehensive test for VM: ${vmName}`);

package/src/index.js

@@ -4,6 +4,7 @@
  * @namespace Underpost
  */
 
+import UnderpostBaremetal from './cli/baremetal.js';
 import UnderpostCluster from './cli/cluster.js';
 import UnderpostCron from './cli/cron.js';
 import UnderpostDB from './cli/db.js';
@@ -31,7 +32,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.798';
+  static version = 'v2.8.811';
   /**
    * Repository cli API
    * @static
@@ -130,6 +131,13 @@ class Underpost {
    * @memberof Underpost
    */
   static lxd = UnderpostLxd.API;
+  /**
+   * Baremetal cli API
+   * @static
+   * @type {UnderpostBaremetal.API}
+   * @memberof Underpost
+   */
+  static baremetal = UnderpostBaremetal.API;
 }
 
 const up = Underpost;

package/src/runtime/lampp/Dockerfile

@@ -1,65 +1,95 @@
-ARG BASE_DEBIAN=buster
+# Use Rocky Linux 9 as the base image
+FROM rockylinux:9
 
-# USER root
+# Set environment variable for non-interactive mode (though less critical for DNF than APT)
+ENV DNF_ASSUMEYES=1
 
-FROM debian:${BASE_DEBIAN}
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Set root password to root, format is 'user:password'.
+# Set root password to root
 RUN echo 'root:root' | chpasswd
 
-RUN apt-get update --fix-missing
-RUN apt-get upgrade -y
-# install sudo
-RUN apt-get -y install sudo
-# net-tools provides netstat commands
-RUN apt-get -y install curl net-tools
-RUN apt-get -yq install openssh-server supervisor
-# Few handy utilities which are nice to have
-RUN apt-get -y install nano vim less --no-install-recommends
-RUN apt-get clean
+# Update system packages and install EPEL, then essential tools
+# DNF is the package manager for Rocky Linux (RHEL-based)
+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 supervisor
+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 ssh
+# Configure SSH
 RUN mkdir -p /var/run/sshd
 # Allow root login via password
 RUN sed -ri 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config
 
-# install open ssl git and others tools
-RUN apt-get install -yq --no-install-recommends libssl-dev curl wget git gnupg
-
-# install lampp
+# 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 bash -c './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
-# 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
+
+# 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
-RUN mkdir /opt/lampp/apache2/conf.d
+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. It'll be accessible via http://localhost:[port]/www/
-# This is convenient because it doesn't interfere with xampp, phpmyadmin or other tools in /opt/lampp/htdocs
-# /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
 
-# install nodejs https://github.com/nodesource/distributions/blob/master/README.md#deb
-RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash -
-RUN apt-get install -y nodejs build-essential
+# Install Node.js
+# Add NodeSource repository for Node.js 23.x (for RHEL-based systems)
+RUN curl -fsSL https://rpm.nodesource.com/setup_23.x | bash -
+RUN dnf install nodejs -y
+RUN dnf clean all
+
+# Verify Node.js and npm versions
 RUN node --version
 RUN npm --version
 
+# Set working directory
 WORKDIR /home/dd
 
+# Expose necessary ports
 EXPOSE 22
-
 EXPOSE 80
-
 EXPOSE 443
-
 EXPOSE 3000-3100
-
 EXPOSE 4000-4100
+
+# Default command to start SSH and XAMPP (Apache and MySQL)
+# Using supervisord to manage multiple processes
+CMD ["/usr/bin/supervisord", "-n"]
+
+# To run XAMPP services under supervisord, you'll need to add a supervisord configuration file.
+# For example, create a file named /etc/supervisord.d/xampp.ini inside the container:
+#
+# [program:sshd]
+# command=/usr/sbin/sshd -D
+# autostart=true
+# autorestart=true
+#
+# [program:apache]
+# command=/opt/lampp/bin/apachectl start
+# autostart=true
+# autorestart=true
+#
+# [program:mysql]
+# command=/opt/lampp/bin/mysql.server start
+# autostart=true
+# autorestart=true

package/src/server/conf.js

@@ -1171,6 +1171,63 @@ const writeEnv = (envPath, envObj) =>
     'utf8',
   );
 
+const buildCliDoc = (program) => {
+  let md = shellExec(`node bin help`, { silent: true, stdout: true }).split('Options:');
+  const baseOptions =
+    `## ${md[0].split(`\n`)[2]}
+
+### Usage: ` +
+    '`' +
+    md[0].split(`\n`)[0].split('Usage: ')[1] +
+    '`' +
+    `
+  ` +
+    '```\n Options:' +
+    md[1] +
+    ' \n```';
+  md =
+    baseOptions +
+    `
+
+## Commands:
+    `;
+  program.commands.map((o) => {
+    md +=
+      `
+
+` +
+      '### `' +
+      o._name +
+      '` :' +
+      `
+` +
+      '```\n ' +
+      shellExec(`node bin help ${o._name}`, { silent: true, stdout: true }) +
+      ' \n```' +
+      `
+  `;
+  });
+  fs.writeFileSync(`./src/client/public/nexodev/docs/references/Command Line Interface.md`, md, 'utf8');
+  fs.writeFileSync(`./cli.md`, md, 'utf8');
+  const readmeSplit = `pwa-microservices-template</a>`;
+  const readme = fs.readFileSync(`./README.md`, 'utf8').split(readmeSplit);
+  fs.writeFileSync(
+    './README.md',
+    readme[0] +
+      readmeSplit +
+      `
+
+` +
+      baseOptions +
+      `
+      
+<a target="_top" href="https://github.com/underpostnet/pwa-microservices-template/blob/master/cli.md">See complete CLI Docs here.</a>
+      
+`,
+    'utf8',
+  );
+};
+
 export {
   Cmd,
   Config,
@@ -1214,4 +1271,5 @@ export {
   deployRangePortFactory,
   awaitDeployMonitor,
   rebuildConfFactory,
+  buildCliDoc,
 };

package/supervisord-openssh-server.conf

@@ -1,5 +0,0 @@
-[program:openssh-server]
-command=/usr/sbin/sshd -D
-numprocs=1
-autostart=true
-autorestart=true