dokku-compose 0.6.7 → 0.6.9

package/dist/index.js

@@ -541,6 +541,18 @@ function parseBuildArgs(dockerOptsBuild) {
   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",
   async read(ctx, target) {
@@ -550,23 +562,35 @@ var Builder = {
       ctx.query("app-json:report", target),
       ctx.query("docker-options:report", target)
     ]);
-    const config = {};
-    const builderReport = parseReport(builderRaw, "builder");
-    const dockerfileReport = parseReport(dockerfileRaw, "builder-dockerfile");
-    const appJsonReport = parseReport(appJsonRaw, "app-json");
-    const dockerOptsReport = parseReport(dockerOptsRaw, "docker-options");
-    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(dockerOptsReport["build"] ?? "");
-    if (Object.keys(args).length > 0) config.args = args;
-    return config;
+    return buildConfigFromReports(
+      parseReport(builderRaw, "builder"),
+      parseReport(dockerfileRaw, "builder-dockerfile"),
+      parseReport(appJsonRaw, "app-json"),
+      parseReport(dockerOptsRaw, "docker-options")["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;
   },
-  // No readAll — builder-dockerfile:report and docker-options:report
-  // don't support bulk mode (no app arg) on all Dokku installations
   async onChange(ctx, target, { after }) {
     if (after.dockerfile)
       await ctx.run("builder-dockerfile:set", target, "dockerfile-path", after.dockerfile);
@@ -606,8 +630,15 @@ var DockerOptions = {
     const raw = await ctx.query("docker-options:report", target);
     return dockerOptsFromReport(parseReport(raw, "docker-options"));
   },
-  // No readAll — docker-options:report doesn't support bulk mode (no app arg)
-  // on all Dokku installations due to basher environment issues
+  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] ?? []);

package/package.json

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