dokku-compose 0.10.0 → 0.11.0

package/README.md

@@ -111,6 +111,7 @@ All features are idempotent — running `up` twice produces no changes.
 | Feature | Description | Reference |
 |---------|-------------|-----------|
 | Apps | Create and destroy Dokku apps | [apps](docs/reference/apps.md) |
+| Dokku Version | Warn when the server's Dokku version is older than the pinned floor | [dokku](docs/reference/dokku.md) |
 | Environment Variables | Set config vars per app or globally, with full convergence | [config](docs/reference/config.md) |
 | Build | Dockerfile path, build context, app.json, build args | [builder](docs/reference/builder.md) |
 | Docker Options | Custom Docker options per phase (build/deploy/run) | [docker_options](docs/reference/docker_options.md) |

package/dist/index.js

@@ -154,6 +154,7 @@ function createRunner(opts = {}) {
   const controlPath = opts.host ? path.join(os.tmpdir(), `dc-${createHash("sha1").update(opts.host).digest("hex").slice(0, 16)}.sock`) : null;
   const sshControlFlags = controlPath ? ["-o", "ControlMaster=auto", "-o", `ControlPath=${controlPath}`, "-o", "ControlPersist=60"] : [];
   function shellQuote(arg) {
+    if (/^[A-Za-z0-9_\-:.,/=@]+$/.test(arg)) return arg;
     return `'${arg.replace(/'/g, "'\\''")}'`;
   }
   async function execDokku(args) {
@@ -274,6 +275,9 @@ function logDone() {
 function logSkip() {
   console.log(`... ${chalk.yellow("already configured")}`);
 }
+function logWarn(context, message) {
+  console.warn(chalk.yellow(`[${context.padEnd(12)}] WARN: ${message}`));
+}
 
 // src/core/reconcile.ts
 async function reconcile(resource, ctx, target, desired) {
@@ -392,18 +396,21 @@ var Domains = {
     for (const d of added) await ctx.run("domains:add", target, d);
   }
 };
+function parseDeployMounts(raw) {
+  return raw.split(/\s+/).filter((s) => s && s !== "-v");
+}
 var Storage = {
   key: "storage",
   read: async (ctx, target) => {
-    const raw = await ctx.query("storage:report", target, "--storage-mounts");
-    return splitLines(raw);
+    const raw = await ctx.query("storage:report", target, "--storage-deploy-mounts");
+    return parseDeployMounts(raw);
   },
   readAll: async (ctx) => {
     const raw = await ctx.query("storage:report");
     const bulk = parseBulkReport(raw, "storage");
     const result = /* @__PURE__ */ new Map();
     for (const [app, report] of bulk) {
-      result.set(app, report["mounts"] ? splitLines(report["mounts"]) : []);
+      result.set(app, report["deploy-mounts"] ? parseDeployMounts(report["deploy-mounts"]) : []);
     }
     return result;
   },
@@ -814,7 +821,7 @@ async function ensurePlugins(ctx, plugins) {
 async function ensureDockerAuth(ctx, config) {
   for (const [server, creds] of Object.entries(config)) {
     logAction("docker-auth", `Logging in to ${server} as ${creds.username}`);
-    await ctx.run("registry:login", server, creds.username, creds.password);
+    await ctx.run("registry:login", "--global", server, creds.username, creds.password);
     logDone();
   }
 }
@@ -1012,6 +1019,40 @@ 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] };
@@ -1094,6 +1135,7 @@ async function ensureGlobalNginx(ctx, nginx) {
 // src/commands/up.ts
 async function runUp(ctx, config, appFilter) {
   const apps = appFilter.length > 0 ? appFilter : Object.keys(config.apps);
+  await ensureDokkuVersion(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);
@@ -1207,9 +1249,8 @@ var ALL_APP_RESOURCES = [
 // src/commands/export.ts
 async function runExport(ctx, opts) {
   const config = { apps: {} };
-  const versionOutput = await ctx.query("version");
-  const versionMatch = versionOutput.match(/(\d+\.\d+\.\d+)/);
-  if (versionMatch) config.dokku = { version: versionMatch[1] };
+  const version2 = extractServerVersion(await ctx.query("version"));
+  if (version2) config.dokku = { version: version2 };
   const apps = opts.appFilter?.length ? opts.appFilter : await exportApps(ctx);
   const networks = await exportNetworks(ctx);
   if (networks.length > 0) config.networks = networks;
@@ -1259,7 +1300,7 @@ function maskSensitiveArgs(cmd) {
     return `${key}=${maskValue(value)}`;
   });
   masked = masked.replace(
-    /^(registry:login\s+\S+\s+\S+\s+)(\S+)/,
+    /^(registry:login\s+(?:--global\s+)?\S+\s+\S+\s+)(\S+)/,
     (_, prefix, password) => `${prefix}${maskValue(password)}`
   );
   return masked;
@@ -1288,6 +1329,7 @@ function maskSensitiveData(data) {
 import chalk2 from "chalk";
 async function computeDiff(ctx, config) {
   const result = { apps: {}, services: {}, inSync: true };
+  await ensureDokkuVersion(ctx, config.dokku?.version);
   const prefetched = /* @__PURE__ */ new Map();
   await Promise.all(
     ALL_APP_RESOURCES.filter((r) => !r.forceApply && !r.key.startsWith("_") && r.readAll).map(async (r) => {

package/package.json

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