dokku-compose 0.6.0 → 0.6.2

package/dist/index.js

@@ -302,14 +302,16 @@ function parseReport(raw, namespace) {
   }
   return result;
 }
-function parseBulkReport(raw, namespace) {
+function parseBulkReport(raw, namespace, headerNamespace) {
   const result = /* @__PURE__ */ new Map();
   const sections = raw.split(/(?=^=====> )/m).filter((s) => s.trim());
+  const nsPattern = (headerNamespace ?? namespace).replace(/-/g, "[\\s-]");
+  const headerRe = new RegExp(`^=====> (.+?)\\s+${nsPattern}\\s+information`, "i");
   for (const section of sections) {
     const headerEnd = section.indexOf("\n");
     if (headerEnd === -1) continue;
     const header = section.slice(0, headerEnd);
-    const match = header.match(/^=====> (.+?)\s+\S+\s+information/);
+    const match = header.match(headerRe);
     if (!match) continue;
     const app = match[1];
     result.set(app, parseReport(section, namespace));
@@ -606,17 +608,47 @@ var Builder = {
 };
 
 // src/resources/docker-options.ts
+var PHASES = ["build", "deploy", "run"];
+function filterManagedOpts(opts) {
+  return opts.filter((o) => !o.startsWith("--link ") && !o.startsWith("--build-arg "));
+}
+function parsePhaseOpts(raw) {
+  if (!raw) return [];
+  const opts = raw.match(/--\S+(?:\s+(?!--)\S+)*/g) ?? [];
+  return filterManagedOpts(opts);
+}
+function dockerOptsFromReport(report) {
+  const result = {};
+  for (const phase of PHASES) {
+    const opts = parsePhaseOpts(report[phase] ?? "");
+    if (opts.length > 0) result[phase] = opts;
+  }
+  return result;
+}
 var DockerOptions = {
   key: "docker_options",
-  forceApply: true,
-  read: async () => ({}),
-  onChange: async (ctx, target, { after }) => {
-    for (const phase of ["build", "deploy", "run"]) {
-      const opts = after[phase];
-      if (!opts || opts.length === 0) continue;
-      await ctx.run("docker-options:clear", target, phase);
-      for (const opt of opts) {
-        await ctx.run("docker-options:add", target, phase, opt);
+  async read(ctx, target) {
+    const raw = await ctx.query("docker-options:report", target);
+    return dockerOptsFromReport(parseReport(raw, "docker-options"));
+  },
+  async readAll(ctx) {
+    const raw = await ctx.query("docker-options:report");
+    const bulk = parseBulkReport(raw, "docker-options");
+    const result = /* @__PURE__ */ new Map();
+    for (const [app, report] of bulk) {
+      result.set(app, dockerOptsFromReport(report));
+    }
+    return result;
+  },
+  async onChange(ctx, target, { before, after }) {
+    for (const phase of PHASES) {
+      const prev = new Set(before[phase] ?? []);
+      const desired = new Set(after[phase] ?? []);
+      for (const opt of desired) {
+        if (!prev.has(opt)) await ctx.run("docker-options:add", target, phase, opt);
+      }
+      for (const opt of prev) {
+        if (!desired.has(opt)) await ctx.run("docker-options:remove", target, phase, opt);
       }
     }
   }

package/package.json

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