dokku-compose 0.13.0 → 0.13.1

package/README.md

@@ -30,7 +30,7 @@ Like Docker Compose, but for Dokku.
 npm install -g dokku-compose
 ```
 
-Requires Node.js >= 20. See the [Installation Reference](docs/reference/install.md) for details.
+Requires Node.js >= 20 and a server running Dokku >= 0.38.22 (every server command stops on an older one; dokku-compose never installs or upgrades Dokku). See the [Installation Reference](docs/reference/install.md) for details.
 
 ### 1. Export your existing server
 

package/dist/chunk-3W53KPE4.js

@@ -0,0 +1,89 @@
+// src/modules/version.ts
+import { createRequire } from "module";
+
+// src/core/logger.ts
+import chalk from "chalk";
+function logAction(context, message) {
+  process.stdout.write(chalk.blue(`[${context.padEnd(12)}]`) + ` ${message}`);
+}
+function logDone() {
+  console.log(`... ${chalk.green("done")}`);
+}
+function logSkip() {
+  console.log(`... ${chalk.yellow("already configured")}`);
+}
+function logError(context, message) {
+  console.error(chalk.red(`[${context.padEnd(12)}] ERROR: ${message}`));
+}
+function logWarn(context, message) {
+  console.warn(chalk.yellow(`[${context.padEnd(12)}] WARN: ${message}`));
+}
+
+// src/modules/version.ts
+var MIN_DOKKU_VERSION = "0.38.22";
+var SEMVER_RE = /^(\d+)\.(\d+)\.(\d+)/;
+function parseSemver(input) {
+  const m = input.match(SEMVER_RE);
+  if (!m) throw new Error(`Cannot parse version: ${input}`);
+  return [Number(m[1]), Number(m[2]), Number(m[3])];
+}
+function extractServerVersion(output) {
+  const match = output.match(/(\d+\.\d+\.\d+)/);
+  return match ? match[1] : null;
+}
+function compareSemver(a, b) {
+  const [aMaj, aMin, aPatch] = parseSemver(a);
+  const [bMaj, bMin, bPatch] = parseSemver(b);
+  if (aMaj !== bMaj) return aMaj < bMaj ? -1 : 1;
+  if (aMin !== bMin) return aMin < bMin ? -1 : 1;
+  if (aPatch !== bPatch) return aPatch < bPatch ? -1 : 1;
+  return 0;
+}
+function toolVersion() {
+  const require2 = createRequire(import.meta.url);
+  for (const p of ["../package.json", "../../package.json"]) {
+    try {
+      return require2(p).version;
+    } catch {
+    }
+  }
+  return "unknown";
+}
+async function assertDokkuSupported(ctx) {
+  const output = await ctx.query("version");
+  const server = extractServerVersion(output);
+  if (!server) {
+    throw new Error(`Cannot parse Dokku server version from output: ${output}`);
+  }
+  if (compareSemver(server, MIN_DOKKU_VERSION) === -1) {
+    throw new Error(
+      `dokku-compose ${toolVersion()} needs Dokku >= ${MIN_DOKKU_VERSION}; this server runs ${server}. Upgrade Dokku first.`
+    );
+  }
+  return server;
+}
+function compareToFile(server, file) {
+  if (!file) return "none";
+  const c = compareSemver(server, file);
+  return c === 0 ? "equal" : c < 0 ? "older" : "newer";
+}
+function enforceFileVersion(server, file) {
+  const rel = compareToFile(server, file);
+  if (rel === "older") {
+    throw new Error(`Dokku server is v${server} but the file requires >= v${file}. Upgrade Dokku or lower dokku.version.`);
+  }
+  if (rel === "newer") {
+    logWarn("dokku", `server is v${server}, newer than dokku.version ${file} in the file; update the file when ready`);
+  }
+}
+
+export {
+  logAction,
+  logDone,
+  logSkip,
+  logError,
+  logWarn,
+  assertDokkuSupported,
+  compareToFile,
+  enforceFileVersion
+};

package/dist/index.js

@@ -1,4 +1,14 @@
 #!/usr/bin/env node
+import {
+  assertDokkuSupported,
+  compareToFile,
+  enforceFileVersion,
+  logAction,
+  logDone,
+  logError,
+  logSkip,
+  logWarn
+} from "./chunk-3W53KPE4.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -388,24 +398,6 @@ function computeAdditiveChange(before, after) {
   return change;
 }
 
-// src/core/logger.ts
-import chalk from "chalk";
-function logAction(context, message) {
-  process.stdout.write(chalk.blue(`[${context.padEnd(12)}]`) + ` ${message}`);
-}
-function logDone() {
-  console.log(`... ${chalk.green("done")}`);
-}
-function logSkip() {
-  console.log(`... ${chalk.yellow("already configured")}`);
-}
-function logError(context, message) {
-  console.error(chalk.red(`[${context.padEnd(12)}] ERROR: ${message}`));
-}
-function logWarn(context, message) {
-  console.warn(chalk.yellow(`[${context.padEnd(12)}] WARN: ${message}`));
-}
-
 // src/core/reconcile.ts
 async function reconcile(resource, ctx, target, desired, onRemovals, prune = false) {
   const canPrune = prune && !!resource.prune && !!resource.removals;
@@ -1460,40 +1452,6 @@ async function exportRedis(ctx) {
   return services;
 }
 
-// src/modules/version.ts
-var SEMVER_RE = /^(\d+)\.(\d+)\.(\d+)/;
-function parseSemver(input) {
-  const m = input.match(SEMVER_RE);
-  if (!m) throw new Error(`Cannot parse version: ${input}`);
-  return [Number(m[1]), Number(m[2]), Number(m[3])];
-}
-function extractServerVersion(output) {
-  const match = output.match(/(\d+\.\d+\.\d+)/);
-  return match ? match[1] : null;
-}
-function compareSemver(a, b) {
-  const [aMaj, aMin, aPatch] = parseSemver(a);
-  const [bMaj, bMin, bPatch] = parseSemver(b);
-  if (aMaj !== bMaj) return aMaj < bMaj ? -1 : 1;
-  if (aMin !== bMin) return aMin < bMin ? -1 : 1;
-  if (aPatch !== bPatch) return aPatch < bPatch ? -1 : 1;
-  return 0;
-}
-async function ensureDokkuVersion(ctx, pinned) {
-  if (!pinned) return;
-  const output = await ctx.query("version");
-  const server = extractServerVersion(output);
-  if (!server) {
-    throw new Error(`Cannot parse Dokku server version from output: ${output}`);
-  }
-  if (compareSemver(server, pinned) === -1) {
-    logWarn(
-      "dokku",
-      `server is v${server} but dokku-compose.yml pins >= v${pinned}. Some features may be unavailable.`
-    );
-  }
-}
-
 // src/modules/links.ts
 function resolveServicePlugin(name, config) {
   if (config.postgres?.[name]) return { plugin: "postgres", config: config.postgres[name] };
@@ -1633,7 +1591,7 @@ async function processApp(ctx, config, app, appConfig, failFast = false, prune =
 }
 async function runUp(ctx, config, appFilter, opts = {}) {
   const apps = appFilter.length > 0 ? appFilter : Object.keys(config.apps);
-  await ensureDokkuVersion(ctx, config.dokku?.version);
+  enforceFileVersion(await assertDokkuSupported(ctx), config.dokku?.version);
   if (config.plugins) await ensurePlugins(ctx, config.plugins);
   if (config.docker_auth) await ensureDockerAuth(ctx, config.docker_auth);
   if (config.domains !== void 0) await ensureGlobalDomains(ctx, config.domains);
@@ -1693,6 +1651,7 @@ var DownFailedError = class extends Error {
 };
 async function runDown(ctx, config, appFilter, opts) {
   const apps = appFilter.length > 0 ? appFilter : Object.keys(config.apps);
+  await assertDokkuSupported(ctx);
   const failures = [];
   for (const app of apps) {
     const appConfig = config.apps[app];
@@ -1762,8 +1721,7 @@ var ALL_APP_RESOURCES = [
 // src/commands/export.ts
 async function runExport(ctx, opts) {
   const config = { apps: {} };
-  const version2 = extractServerVersion(await ctx.query("version"));
-  if (version2) config.dokku = { version: version2 };
+  config.dokku = { version: await assertDokkuSupported(ctx) };
   const apps = opts.appFilter?.length ? opts.appFilter : await exportApps(ctx);
   const networks = await exportNetworks(ctx);
   if (networks.length > 0) config.networks = networks;
@@ -1803,7 +1761,7 @@ async function runExport(ctx, opts) {
 }
 
 // src/commands/diff.ts
-import chalk2 from "chalk";
+import chalk from "chalk";
 function diffSslStatus(desired, current) {
   if (typeof desired !== "object" || desired === null) return void 0;
   if (current === void 0) return void 0;
@@ -1823,7 +1781,12 @@ function isEmptyValue(value) {
 async function computeDiff(ctx, config) {
   const result = { apps: {}, services: {}, plugins: {}, inSync: true, readWarnings: [] };
   const appNames = Object.keys(config.apps);
-  await ensureDokkuVersion(ctx, config.dokku?.version);
+  const serverVersion = await assertDokkuSupported(ctx);
+  const fileVersion = config.dokku?.version;
+  if (fileVersion && compareToFile(serverVersion, fileVersion) !== "equal") {
+    result.dokku = { file: fileVersion, server: serverVersion };
+    result.inSync = false;
+  }
   const appExists = /* @__PURE__ */ new Map();
   await Promise.all(
     appNames.map(async (app) => {
@@ -1967,7 +1930,7 @@ async function computeDiff(ctx, config) {
   return result;
 }
 function maskDiffResult(diff) {
-  const masked = { apps: {}, services: diff.services, plugins: diff.plugins, inSync: diff.inSync, readWarnings: diff.readWarnings };
+  const masked = { apps: {}, services: diff.services, plugins: diff.plugins, dokku: diff.dokku, inSync: diff.inSync, readWarnings: diff.readWarnings };
   for (const [app, appDiff] of Object.entries(diff.apps)) {
     const maskedAppDiff = {};
     for (const [feature, d] of Object.entries(appDiff)) {
@@ -1991,15 +1954,19 @@ function formatSummary(diff) {
       lines.push(`  app: ${app}`);
       lines.push(`    (in sync)`);
     } else {
-      lines.push(`  app: ${chalk2.bold(app)}`);
+      lines.push(`  app: ${chalk.bold(app)}`);
       for (const [feature, d] of changes) {
-        const sym = d.status === "missing" ? chalk2.green("+") : d.status === "unknown" ? chalk2.red("?") : d.status === "extra" ? chalk2.red("-") : chalk2.yellow("~");
+        const sym = d.status === "missing" ? chalk.green("+") : d.status === "unknown" ? chalk.red("?") : d.status === "extra" ? chalk.red("-") : chalk.yellow("~");
         lines.push(`    ${sym} ${feature}: ${formatFeatureSummary(d)}`);
       }
     }
   }
+  if (diff.dokku) {
+    lines.push(`  dokku`);
+    lines.push(`    ${chalk.yellow("~")} version: ${diff.dokku.file} (file) \u2192 ${diff.dokku.server} (server)`);
+  }
   for (const [name, d] of Object.entries(diff.plugins)) {
-    const sym = d.status === "missing" ? chalk2.green("+") : d.status === "unknown" ? chalk2.red("?") : chalk2.yellow("~");
+    const sym = d.status === "missing" ? chalk.green("+") : d.status === "unknown" ? chalk.red("?") : chalk.yellow("~");
     const detail = d.status === "missing" ? `not installed (want ${d.desired ?? "any"})` : `${d.current} \u2192 ${d.desired}`;
     lines.push(`  plugin: ${name}`);
     lines.push(`    ${sym} version: ${detail}${d.note ? ` (${d.note})` : ""}`);
@@ -2007,20 +1974,20 @@ function formatSummary(diff) {
   for (const [svc, d] of Object.entries(diff.services)) {
     if (d.status === "missing") {
       lines.push(`  services:`);
-      lines.push(`    ${chalk2.green("+")} ${svc}: not provisioned`);
+      lines.push(`    ${chalk.green("+")} ${svc}: not provisioned`);
     }
   }
-  const total = Object.values(diff.apps).flatMap((a) => Object.values(a)).filter((d) => d.status !== "in-sync").length + Object.values(diff.services).filter((d) => d.status !== "in-sync").length + Object.values(diff.plugins).filter((d) => d.status !== "unknown").length;
+  const total = Object.values(diff.apps).flatMap((a) => Object.values(a)).filter((d) => d.status !== "in-sync").length + Object.values(diff.services).filter((d) => d.status !== "in-sync").length + Object.values(diff.plugins).filter((d) => d.status !== "unknown").length + (diff.dokku ? 1 : 0);
   if (diff.readWarnings.length > 0) {
     lines.push("");
-    lines.push(chalk2.red("  Could not read some server state \u2014 treated as unknown, not missing:"));
-    for (const w of diff.readWarnings) lines.push(chalk2.red(`    - ${w}`));
+    lines.push(chalk.red("  Could not read some server state \u2014 treated as unknown, not missing:"));
+    for (const w of diff.readWarnings) lines.push(chalk.red(`    - ${w}`));
   }
   lines.push("");
   if (total === 0) {
-    lines.push(chalk2.green("  Everything in sync."));
+    lines.push(chalk.green("  Everything in sync."));
   } else {
-    lines.push(chalk2.yellow(`  ${total} resource(s) out of sync.`));
+    lines.push(chalk.yellow(`  ${total} resource(s) out of sync.`));
   }
   lines.push("");
   return lines.join("\n");
@@ -2050,36 +2017,41 @@ function formatVerbose(diff) {
     for (const [feature, d] of changes) {
       lines.push(`@@ app: ${app} / ${feature} @@`);
       if (d.status === "unknown") {
-        lines.push(chalk2.red(`  ? could not read server state \u2014 not reported as missing`));
+        lines.push(chalk.red(`  ? could not read server state \u2014 not reported as missing`));
         continue;
       }
       if (d.status === "extra") {
-        for (const r of d.removed ?? []) lines.push(chalk2.red(`- ${r}`));
+        for (const r of d.removed ?? []) lines.push(chalk.red(`- ${r}`));
         if (d.note) lines.push(`  (${d.note})`);
         continue;
       }
       const currentLines = d.current !== void 0 ? JSON.stringify(d.current, showUnset, 2).split("\n") : [];
       const desiredLines = JSON.stringify(d.desired, showUnset, 2).split("\n");
-      for (const line of currentLines) lines.push(chalk2.red(`- ${line}`));
-      for (const line of desiredLines) lines.push(chalk2.green(`+ ${line}`));
-      for (const r of d.removed ?? []) lines.push(chalk2.red(`- ${r} (not in the file)`));
+      for (const line of currentLines) lines.push(chalk.red(`- ${line}`));
+      for (const line of desiredLines) lines.push(chalk.green(`+ ${line}`));
+      for (const r of d.removed ?? []) lines.push(chalk.red(`- ${r} (not in the file)`));
     }
   }
+  if (diff.dokku) {
+    lines.push(`@@ dokku version @@`);
+    lines.push(chalk.red(`- ${diff.dokku.server} (server)`));
+    lines.push(chalk.green(`+ ${diff.dokku.file} (file)`));
+  }
   for (const [name, d] of Object.entries(diff.plugins)) {
     lines.push(`@@ plugin: ${name} @@`);
-    if (d.current !== void 0) lines.push(chalk2.red(`- ${d.current}`));
-    lines.push(chalk2.green(`+ ${d.desired ?? "(any version)"}`) + (d.note ? ` (${d.note})` : ""));
+    if (d.current !== void 0) lines.push(chalk.red(`- ${d.current}`));
+    lines.push(chalk.green(`+ ${d.desired ?? "(any version)"}`) + (d.note ? ` (${d.note})` : ""));
   }
   for (const [svc, d] of Object.entries(diff.services)) {
     if (d.status === "missing") {
       lines.push(`@@ services @@`);
-      lines.push(chalk2.green(`+ ${svc}`));
+      lines.push(chalk.green(`+ ${svc}`));
     }
   }
   if (diff.readWarnings.length > 0) {
     lines.push("");
-    lines.push(chalk2.red("Could not read some server state \u2014 treated as unknown, not missing:"));
-    for (const w of diff.readWarnings) lines.push(chalk2.red(`  - ${w}`));
+    lines.push(chalk.red("Could not read some server state \u2014 treated as unknown, not missing:"));
+    for (const w of diff.readWarnings) lines.push(chalk.red(`  - ${w}`));
   }
   lines.push("");
   return lines.join("\n");
@@ -2136,7 +2108,7 @@ function validate(filePath) {
 }
 
 // src/index.ts
-import chalk3 from "chalk";
+import chalk2 from "chalk";
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
 var program = new Command().name("dokku-compose").version(version);
@@ -2160,7 +2132,7 @@ program.command("up [apps...]").description("Create/update apps and services to
       }
     }
   } catch (error) {
-    console.error(chalk3.red(`
+    console.error(chalk2.red(`
 ${error.message}`));
     process.exitCode = 1;
   } finally {
@@ -2178,7 +2150,7 @@ program.command("down [apps...]").description("Destroy apps and services (requir
   try {
     await runDown(ctx, config, apps, { force: true, failFast: opts.failFast ?? false });
   } catch (error) {
-    console.error(chalk3.red(`
+    console.error(chalk2.red(`
 ${error.message}`));
     process.exitCode = 1;
   } finally {
@@ -2216,6 +2188,10 @@ program.command("export").description("Export server state to dokku-compose.yml
     } else {
       process.stdout.write(out);
     }
+  } catch (error) {
+    console.error(chalk2.red(`
+${error.message}`));
+    process.exitCode = 1;
   } finally {
     await ctx.close();
   }
@@ -2230,6 +2206,10 @@ program.command("diff").description("Show what is out of sync between config and
     const output = opts.verbose ? formatVerbose(diff) : formatSummary(diff);
     process.stdout.write(output);
     process.exitCode = rawDiff.inSync ? 0 : 1;
+  } catch (error) {
+    console.error(chalk2.red(`
+${error.message}`));
+    process.exitCode = 1;
   } finally {
     await ctx.close();
   }
@@ -2238,8 +2218,12 @@ program.command("ps [apps...]").description("Show status of configured apps").op
   const config = loadConfig(opts.file);
   const runner = makeRunner({});
   try {
-    const { runPs } = await import("./ps-33II4UU3.js");
+    const { runPs } = await import("./ps-IWBYZRDO.js");
     await runPs(runner, config, apps);
+  } catch (error) {
+    console.error(chalk2.red(`
+${error.message}`));
+    process.exitCode = 1;
   } finally {
     await runner.close();
   }

package/dist/{ps-33II4UU3.js → ps-IWBYZRDO.js}

@@ -1,6 +1,11 @@
+import {
+  assertDokkuSupported
+} from "./chunk-3W53KPE4.js";
+
 // src/commands/ps.ts
 async function runPs(runner, config, appFilter) {
   const apps = appFilter.length > 0 ? appFilter : Object.keys(config.apps);
+  await assertDokkuSupported(runner);
   for (const app of apps) {
     const exists = await runner.check("apps:exists", app);
     if (!exists) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dokku-compose",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Docker Compose for Dokku — declare your entire server in a single YAML file.",
   "main": "dist/index.js",
   "exports": "./dist/index.js",