cyberia 3.2.12 → 3.2.22

package/src/runtime/cyberia-server/Dockerfile.dev

@@ -1,23 +1,6 @@
 # cyberia-server DEV runtime image.
-#
-# Differences vs the production Dockerfile in this same directory:
-#   - Builds the Go binary WITHOUT `-trimpath -ldflags="-s -w"` so symbols
-#     and source paths survive into the binary for stack traces and pprof.
-#   - Keeps -race (CGO-free race detector is not available; we still pass
-#     `-gcflags="all=-N -l"` to disable inlining + optimisations so the
-#     dlv debugger and live profilers can attach predictably).
-#   - Keeps `git`, `procps-ng`, `strace`, `lsof`, `vim`, `curl` in the
-#     runtime image so the operator can attach and inspect a misbehaving
-#     pod without re-baking the image. Production keeps the runtime
-#     layer minimal.
-#   - Does NOT strip the npm cache after `npm install -g underpost@…` so
-#     `npm upgrade -g underpost` works in a running container.
-#
-# Selected automatically by `node bin run instance-build-manifest`
-# whenever the `--dev` flag is set; the production Dockerfile in the
-# same directory is used otherwise.
 
-# --- Build Image
+# --- Build Image ---
 FROM rockylinux/rockylinux:9 AS builder
 
 RUN dnf -y update && \
@@ -30,18 +13,16 @@ RUN dnf -y update && \
 
 WORKDIR /build
 
-# Build context is the cyberia-server project repo root (see the
-# production Dockerfile in this directory for the rationale).
 COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . ./
-# Dev build: keep source paths, disable inlining + optimisations.
+
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
       go build -gcflags="all=-N -l" -o server ./cmd/cyberia-server/ && \
     echo "DEV build complete: $(pwd)/server"
 
-# --- Runtime Image
+# --- Runtime Image ---
 FROM rockylinux/rockylinux:9 AS runtime
 
 ARG UNDERPOST_VERSION=3.2.9
@@ -59,11 +40,6 @@ WORKDIR /home/dd/engine/cyberia-server
 
 COPY --from=builder /build/server ./server
 
-# Static SSR dashboard — required by the Go server's findPublicDir() at boot.
-# See the production Dockerfile in this directory for the full rationale.
-# The same `node bin/cyberia run-workflow build-server-dashboard --dev
-# --output-path <project-root>/public/index.html` command is executed by
-# the CI workflow before docker build.
 COPY public/ ./public/
 
 EXPOSE 8081

package/src/runtime/wp/Dockerfile

@@ -3,7 +3,7 @@ FROM rockylinux:9
 # System packages 
 RUN dnf -y update && \
     dnf -y install epel-release && \
-    dnf -y install --allowerasing \
+    dnf -y install --allowerasing --nobest \
     bzip2 \
     sudo \
     curl \
@@ -20,8 +20,8 @@ RUN dnf -y update && \
     perl && \
     dnf clean all
 
-# Download and install XAMPP (PHP 8.2)
-RUN curl -L -o /tmp/xampp-linux-installer.run "https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/8.2.12/xampp-linux-x64-8.2.12-0-installer.run" && \
+# Download and install XAMPP (PHP 8.2) with retry logic for flaky SourceForge transfers
+RUN curl -L --retry 5 --retry-delay 10 --retry-max-time 180 -o /tmp/xampp-linux-installer.run "https://sourceforge.net/projects/xampp/files/XAMPP%20Linux/8.2.12/xampp-linux-x64-8.2.12-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

package/src/server/catalog-underpost.js

@@ -0,0 +1,61 @@
+/**
+ * Underpost platform content catalog — the base `pwa-microservices-template`.
+ *
+ * @module src/server/catalog-underpost.js
+ * @namespace UnderpostCatalog
+ */
+
+/**
+ * Workflow + service files re-added to the template after the engine-only strip.
+ * @constant {string[]}
+ * @memberof UnderpostCatalog
+ */
+const TEMPLATE_RESTORE_PATHS = [
+  `./src/server/catalog-underpost.js`,
+  `./.github/workflows/pwa-microservices-template-page.cd.yml`,
+  `./.github/workflows/pwa-microservices-template-test.ci.yml`,
+  `./.github/workflows/npmpkg.ci.yml`,
+  `./.github/workflows/ghpkg.ci.yml`,
+  `./.github/workflows/gitlab.ci.yml`,
+  `./.github/workflows/publish.ci.yml`,
+  `./.github/workflows/release.cd.yml`,
+  `./src/client/services/user/guest.service.js`,
+  './src/api/user/guest.service.js',
+  './src/ws/IoInterface.js',
+  './src/ws/IoServer.js',
+  './manifests/deployment/dd-default-development',
+];
+
+/**
+ * npm keywords for the standalone Underpost platform / template package.
+ * @constant {string[]}
+ * @memberof UnderpostCatalog
+ */
+const TEMPLATE_KEYWORDS = [
+  'underpost',
+  'underpost-platform',
+  'cli',
+  'toolchain',
+  'ci-cd',
+  'devops',
+  'kubernetes',
+  'k3s',
+  'kubeadm',
+  'lxd',
+  'baremetal',
+  'container-orchestration',
+  'image-management',
+  'pwa',
+  'workbox',
+  'microservices',
+];
+
+/**
+ * npm description for the standalone Underpost platform / template package.
+ * @constant {string}
+ * @memberof UnderpostCatalog
+ */
+const TEMPLATE_DESCRIPTION =
+  'Underpost Platform — end-to-end CI/CD and application-delivery toolchain CLI. Covers bare metal, Kubernetes, K3s, kubeadm, LXD, container/image orchestration, secrets, databases, cron jobs, monitoring, SSH, runners, PWA + Workbox delivery, and release orchestration. Extensible via downstream CLIs.';
+
+export { TEMPLATE_RESTORE_PATHS, TEMPLATE_KEYWORDS, TEMPLATE_DESCRIPTION };

package/src/server/catalog.js

@@ -0,0 +1,77 @@
+/**
+ * Dynamic product-catalog resolver.
+ *
+ * Product catalogs (`catalog-<suffix>.js`, e.g. `catalog-cyberia`, `catalog-prototype`)
+ * are loaded lazily by deploy id via ES dynamic `import()` so the base build
+ * (`bin/build`) and template assembly (`bin/build.template`) never statically
+ * depend on any product module. Removing a product catalog simply makes its
+ * deploy id resolve to the empty catalog — nothing else breaks.
+ *
+ * Each product catalog default-exports the uniform shape documented in
+ * {@link module:src/server/catalog-cyberia}.
+ *
+ * @module src/server/catalog.js
+ * @namespace Catalog
+ */
+
+import fs from 'fs-extra';
+import { fileURLToPath } from 'node:url';
+import * as path from 'node:path';
+
+const catalogDir = path.dirname(fileURLToPath(import.meta.url));
+
+/** Empty product catalog returned for deploy ids without a dedicated module. */
+const EMPTY_CATALOG = {
+  sourceMoves: [],
+  privateConfPaths: [],
+  templatePaths: [],
+  stripPaths: [],
+  keywords: [],
+  description: '',
+};
+
+/**
+ * Loads a single deploy id's product catalog. The suffix after `dd-` selects the
+ * module (`dd-cyberia` → `catalog-cyberia.js`). Returns {@link EMPTY_CATALOG} when
+ * the deploy id has no dedicated catalog or the module cannot be loaded.
+ *
+ * @method loadDeployCatalog
+ * @param {string} deployId - A concrete deploy id (e.g. `dd-cyberia`).
+ * @returns {Promise<object>} The product catalog (uniform shape).
+ * @memberof Catalog
+ */
+const loadDeployCatalog = async (deployId) => {
+  const suffix = (deployId ?? '').split('dd-')[1];
+  if (!suffix) return EMPTY_CATALOG;
+  try {
+    const mod = await import(`./catalog-${suffix}.js`);
+    return { ...EMPTY_CATALOG, ...(mod.default ?? {}) };
+  } catch {
+    return EMPTY_CATALOG;
+  }
+};
+
+/**
+ * Loads every product catalog present alongside this module (`catalog-*.js`,
+ * excluding the base `catalog-underpost` and this resolver). Used to aggregate
+ * product `stripPaths` for the base template without naming any product.
+ *
+ * @method loadProductCatalogs
+ * @returns {Promise<object[]>} Loaded product catalogs (uniform shape).
+ * @memberof Catalog
+ */
+const loadProductCatalogs = async () => {
+  const catalogs = [];
+  for (const file of fs.readdirSync(catalogDir)) {
+    if (!/^catalog-.+\.js$/.test(file) || file === 'catalog-underpost.js') continue;
+    try {
+      const mod = await import(`./${file}`);
+      if (mod.default) catalogs.push({ ...EMPTY_CATALOG, ...mod.default });
+    } catch {
+      /* a malformed/removed product catalog must not break the base build */
+    }
+  }
+  return catalogs;
+};
+
+export { loadDeployCatalog, loadProductCatalogs, EMPTY_CATALOG };