dokku-compose 0.6.10 → 0.6.12

package/README.md

@@ -176,7 +176,7 @@ apps:
 
 ### Docker Options
 
-Add custom Docker options per build phase (`build`, `deploy`, `run`). Each phase is cleared and re-populated on every `up` for idempotent convergence.
+Add custom Docker options per build phase (`build`, `deploy`, `run`). Options are converged with targeted add/remove — only changed options are modified, preserving entries managed by other resources (e.g. `--link`, `--build-arg`).
 
 ```yaml
 apps:
@@ -411,8 +411,10 @@ dokku-compose down --force           # Destroy all configured apps
 |--------|-------------|
 | `--file <path>` | Config file (default: `dokku-compose.yml`) |
 | `--dry-run` | Print commands without executing |
+| `--sensitive` | Show sensitive values in output (masked by default) |
 | `--fail-fast` | Stop on first error (default: continue to next app) |
 | `--remove-orphans` | Destroy services and networks not in config |
+| `--verbose` | Show git-style +/- diff (diff command only) |
 | `--help` | Show usage |
 | `--version` | Show version |
 
@@ -429,14 +431,14 @@ dokku-compose ps                      # Show status
 ## Execution Modes
 
 ```bash
-# Run locally on the Dokku server
-dokku-compose up
-
-# Run remotely over SSH
+# Run remotely over SSH (recommended)
 DOKKU_HOST=my-server.example.com dokku-compose up
+
+# Run on the Dokku server itself (use DOKKU_HOST=localhost for best compatibility)
+DOKKU_HOST=localhost dokku-compose up
 ```
 
-When `DOKKU_HOST` is set, all Dokku commands are sent over SSH. This is the typical workflow — keep `dokku-compose.yml` in your project repo and apply it from your local machine. SSH key access to the Dokku server is required.
+When `DOKKU_HOST` is set, all Dokku commands are sent over SSH. This is the recommended mode — it works both remotely from your local machine and directly on the server. SSH mode avoids compatibility issues with Dokku's basher environment that can affect some commands when called directly from Node.js. SSH key access to the Dokku server is required.
 
 ## What `up` Does
 

package/dist/index.js

@@ -721,8 +721,34 @@ var Networks = {
 };
 var NetworkProps = {
   key: "network",
-  forceApply: true,
-  read: async () => ({}),
+  read: async (ctx, target) => {
+    const raw = await ctx.query("network:report", target);
+    const report = parseReport(raw, "network");
+    const config = {};
+    if (report["attach-post-create"]) {
+      config.attach_post_create = report["attach-post-create"].split(/\s+/);
+    }
+    if (report["initial-network"]) config.initial_network = report["initial-network"];
+    if (report["bind-all-interfaces"] === "true") config.bind_all_interfaces = true;
+    if (report["tld"]) config.tld = report["tld"];
+    return config;
+  },
+  readAll: async (ctx) => {
+    const raw = await ctx.query("network:report");
+    const bulk = parseBulkReport(raw, "network");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      const config = {};
+      if (report["attach-post-create"]) {
+        config.attach_post_create = report["attach-post-create"].split(/\s+/);
+      }
+      if (report["initial-network"]) config.initial_network = report["initial-network"];
+      if (report["bind-all-interfaces"] === "true") config.bind_all_interfaces = true;
+      if (report["tld"]) config.tld = report["tld"];
+      result.set(app, config);
+    }
+    return result;
+  },
   onChange: async (ctx, target, { after }) => {
     if (after.attach_post_create !== void 0 && after.attach_post_create !== false) {
       const nets = Array.isArray(after.attach_post_create) ? after.attach_post_create : [after.attach_post_create];
@@ -1317,13 +1343,14 @@ ${result.errors.length} error(s), ${result.warnings.length} warning(s)`);
     console.log("Valid.");
   }
 });
-program.command("export").description("Export server state to dokku-compose.yml format").option("--app <app>", "Export only a specific app").option("-o, --output <path>", "Write to file instead of stdout").action(async (opts) => {
+program.command("export").description("Export server state to dokku-compose.yml format").option("--app <app>", "Export only a specific app").option("-o, --output <path>", "Write to file instead of stdout").option("--sensitive", "Show sensitive values (masked by default)").action(async (opts) => {
   const runner = makeRunner({});
   const ctx = createContext(runner);
   try {
-    const result = await runExport(ctx, {
+    const rawResult = await runExport(ctx, {
       appFilter: opts.app ? [opts.app] : void 0
     });
+    const result = opts.sensitive ? rawResult : maskSensitiveData(rawResult);
     const out = yaml3.dump(result, { lineWidth: 120 });
     if (opts.output) {
       fs3.writeFileSync(opts.output, out);

package/package.json

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