dokku-compose 0.6.3 → 0.6.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +19 -15
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -142,6 +142,11 @@ function createRunner(opts = {}) {
|
|
|
142
142
|
const result = await execa("dokku", args);
|
|
143
143
|
return { stdout: result.stdout, ok: true };
|
|
144
144
|
} catch (e) {
|
|
145
|
+
if (process.env.DOKKU_COMPOSE_DEBUG) {
|
|
146
|
+
console.error(`[debug] execDokku error for: dokku ${args.join(" ")}`);
|
|
147
|
+
console.error(`[debug] exit code: ${e.exitCode}, stderr: ${(e.stderr ?? "").slice(0, 200)}`);
|
|
148
|
+
console.error(`[debug] stdout length: ${(e.stdout ?? "").length}`);
|
|
149
|
+
}
|
|
145
150
|
return { stdout: e.stdout ?? "", ok: false };
|
|
146
151
|
}
|
|
147
152
|
}
|
|
@@ -556,12 +561,10 @@ function buildConfigFromReports(builderReport, dockerfileReport, appJsonReport,
|
|
|
556
561
|
var Builder = {
|
|
557
562
|
key: "build",
|
|
558
563
|
async read(ctx, target) {
|
|
559
|
-
const
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
ctx.query("docker-options:report", target)
|
|
564
|
-
]);
|
|
564
|
+
const builderRaw = await ctx.query("builder:report", target);
|
|
565
|
+
const dockerfileRaw = await ctx.query("builder-dockerfile:report", target);
|
|
566
|
+
const appJsonRaw = await ctx.query("app-json:report", target);
|
|
567
|
+
const dockerOptsRaw = await ctx.query("docker-options:report", target);
|
|
565
568
|
const dockerOptsReport = parseReport(dockerOptsRaw, "docker-options");
|
|
566
569
|
return buildConfigFromReports(
|
|
567
570
|
parseReport(builderRaw, "builder"),
|
|
@@ -571,22 +574,23 @@ var Builder = {
|
|
|
571
574
|
);
|
|
572
575
|
},
|
|
573
576
|
async readAll(ctx) {
|
|
574
|
-
const
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
ctx.query("docker-options:report")
|
|
579
|
-
]);
|
|
577
|
+
const builderRaw = await ctx.query("builder:report");
|
|
578
|
+
const dockerfileRaw = await ctx.query("builder-dockerfile:report");
|
|
579
|
+
const appJsonRaw = await ctx.query("app-json:report");
|
|
580
|
+
const dockerOptsRaw = await ctx.query("docker-options:report");
|
|
580
581
|
const builderBulk = parseBulkReport(builderRaw, "builder");
|
|
581
582
|
const dockerfileBulk = parseBulkReport(dockerfileRaw, "builder-dockerfile");
|
|
582
583
|
const appJsonBulk = parseBulkReport(appJsonRaw, "app-json");
|
|
583
584
|
const dockerOptsBulk = parseBulkReport(dockerOptsRaw, "docker-options");
|
|
584
585
|
if (process.env.DOKKU_COMPOSE_DEBUG) {
|
|
585
|
-
|
|
586
|
+
console.error("[debug] builderRaw length:", builderRaw.length);
|
|
587
|
+
console.error("[debug] dockerfileRaw length:", dockerfileRaw.length);
|
|
588
|
+
console.error("[debug] appJsonRaw length:", appJsonRaw.length);
|
|
589
|
+
console.error("[debug] dockerOptsRaw length:", dockerOptsRaw.length);
|
|
590
|
+
console.error("[debug] dockerfileRaw first 300:", JSON.stringify(dockerfileRaw.slice(0, 300)));
|
|
591
|
+
console.error("[debug] dockerOptsRaw first 300:", JSON.stringify(dockerOptsRaw.slice(0, 300)));
|
|
586
592
|
console.error("[debug] builderBulk keys:", [...builderBulk.keys()]);
|
|
587
593
|
console.error("[debug] dockerfileBulk keys:", [...dockerfileBulk.keys()]);
|
|
588
|
-
console.error("[debug] dockerfileBulk[" + app0 + "]:", JSON.stringify(dockerfileBulk.get(app0)));
|
|
589
|
-
console.error("[debug] dockerOptsRaw first 200:", dockerOptsRaw.slice(0, 200));
|
|
590
594
|
console.error("[debug] dockerOptsBulk keys:", [...dockerOptsBulk.keys()]);
|
|
591
595
|
}
|
|
592
596
|
const result = /* @__PURE__ */ new Map();
|