dokku-compose 0.5.2 → 0.6.1

package/dist/index.js

@@ -285,7 +285,8 @@ var Apps = {
 // src/resources/parsers.ts
 function parseReport(raw, namespace) {
   const result = {};
-  const prefix = new RegExp(`^${namespace}\\s+`, "i");
+  const prefixPattern = namespace.replace(/-/g, "[\\s-]");
+  const prefix = new RegExp(`^${prefixPattern}\\s+`, "i");
   for (const line of raw.split("\n")) {
     if (line.trimStart().startsWith("=====>")) continue;
     const colonIdx = line.indexOf(":");
@@ -532,11 +533,64 @@ var Certs = {
 };
 
 // src/resources/builder.ts
+function parseBuildArgs(dockerOptsBuild) {
+  const args = {};
+  const matches = dockerOptsBuild.matchAll(/--build-arg\s+(\S+?)=(\S+)/g);
+  for (const m of matches) args[m[1]] = m[2];
+  return args;
+}
+function buildConfigFromReports(builderReport, dockerfileReport, appJsonReport, dockerOptsBuild) {
+  const config = {};
+  if (dockerfileReport["dockerfile-path"])
+    config.dockerfile = dockerfileReport["dockerfile-path"];
+  if (appJsonReport["selected"])
+    config.app_json = appJsonReport["selected"];
+  if (builderReport["build-dir"])
+    config.context = builderReport["build-dir"];
+  const args = parseBuildArgs(dockerOptsBuild);
+  if (Object.keys(args).length > 0) config.args = args;
+  return config;
+}
 var Builder = {
   key: "build",
-  forceApply: true,
-  read: async () => ({}),
-  onChange: async (ctx, target, { after }) => {
+  async read(ctx, target) {
+    const [builderRaw, dockerfileRaw, appJsonRaw, dockerOptsRaw] = await Promise.all([
+      ctx.query("builder:report", target),
+      ctx.query("builder-dockerfile:report", target),
+      ctx.query("app-json:report", target),
+      ctx.query("docker-options:report", target)
+    ]);
+    const dockerOptsReport = parseReport(dockerOptsRaw, "docker-options");
+    return buildConfigFromReports(
+      parseReport(builderRaw, "builder"),
+      parseReport(dockerfileRaw, "builder-dockerfile"),
+      parseReport(appJsonRaw, "app-json"),
+      dockerOptsReport["build"] ?? ""
+    );
+  },
+  async readAll(ctx) {
+    const [builderRaw, dockerfileRaw, appJsonRaw, dockerOptsRaw] = await Promise.all([
+      ctx.query("builder:report"),
+      ctx.query("builder-dockerfile:report"),
+      ctx.query("app-json:report"),
+      ctx.query("docker-options:report")
+    ]);
+    const builderBulk = parseBulkReport(builderRaw, "builder");
+    const dockerfileBulk = parseBulkReport(dockerfileRaw, "builder-dockerfile");
+    const appJsonBulk = parseBulkReport(appJsonRaw, "app-json");
+    const dockerOptsBulk = parseBulkReport(dockerOptsRaw, "docker-options");
+    const result = /* @__PURE__ */ new Map();
+    for (const app of builderBulk.keys()) {
+      result.set(app, buildConfigFromReports(
+        builderBulk.get(app) ?? {},
+        dockerfileBulk.get(app) ?? {},
+        appJsonBulk.get(app) ?? {},
+        dockerOptsBulk.get(app)?.["build"] ?? ""
+      ));
+    }
+    return result;
+  },
+  async onChange(ctx, target, { after }) {
     if (after.dockerfile)
       await ctx.run("builder-dockerfile:set", target, "dockerfile-path", after.dockerfile);
     if (after.app_json)
@@ -552,17 +606,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.5.2",
+  "version": "0.6.1",
   "description": "Docker Compose for Dokku — declare your entire server in a single YAML file.",
   "main": "dist/index.js",
   "exports": "./dist/index.js",