dokku-compose 0.6.11 → 0.6.13

package/dist/index.js

@@ -129,10 +129,13 @@ function createRunner(opts = {}) {
   const log = [];
   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) {
+    return `'${arg.replace(/'/g, "'\\''")}'`;
+  }
   async function execDokku(args) {
     if (opts.host) {
       try {
-        const result = await execa("ssh", [...sshControlFlags, `dokku@${opts.host}`, ...args]);
+        const result = await execa("ssh", [...sshControlFlags, `dokku@${opts.host}`, "--", ...args.map(shellQuote)]);
         return { stdout: result.stdout, ok: true };
       } catch (e) {
         return { stdout: e.stdout ?? "", ok: false };
@@ -150,7 +153,7 @@ function createRunner(opts = {}) {
     dryRunLog: log,
     async run(...args) {
       if (opts.dryRun) {
-        log.push(args.join(" "));
+        log.push(args.map((a) => a.includes(" ") ? shellQuote(a) : a).join(" "));
         return;
       }
       await execDokku(args);
@@ -721,8 +724,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];

package/package.json

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