dokku-compose 0.6.1 → 0.6.3
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 +12 -2
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -302,14 +302,16 @@ function parseReport(raw, namespace) {
|
|
|
302
302
|
}
|
|
303
303
|
return result;
|
|
304
304
|
}
|
|
305
|
-
function parseBulkReport(raw, namespace) {
|
|
305
|
+
function parseBulkReport(raw, namespace, headerNamespace) {
|
|
306
306
|
const result = /* @__PURE__ */ new Map();
|
|
307
307
|
const sections = raw.split(/(?=^=====> )/m).filter((s) => s.trim());
|
|
308
|
+
const nsPattern = (headerNamespace ?? namespace).replace(/-/g, "[\\s-]");
|
|
309
|
+
const headerRe = new RegExp(`^=====> (.+?)\\s+${nsPattern}\\s+information`, "i");
|
|
308
310
|
for (const section of sections) {
|
|
309
311
|
const headerEnd = section.indexOf("\n");
|
|
310
312
|
if (headerEnd === -1) continue;
|
|
311
313
|
const header = section.slice(0, headerEnd);
|
|
312
|
-
const match = header.match(
|
|
314
|
+
const match = header.match(headerRe);
|
|
313
315
|
if (!match) continue;
|
|
314
316
|
const app = match[1];
|
|
315
317
|
result.set(app, parseReport(section, namespace));
|
|
@@ -579,6 +581,14 @@ var Builder = {
|
|
|
579
581
|
const dockerfileBulk = parseBulkReport(dockerfileRaw, "builder-dockerfile");
|
|
580
582
|
const appJsonBulk = parseBulkReport(appJsonRaw, "app-json");
|
|
581
583
|
const dockerOptsBulk = parseBulkReport(dockerOptsRaw, "docker-options");
|
|
584
|
+
if (process.env.DOKKU_COMPOSE_DEBUG) {
|
|
585
|
+
const app0 = [...builderBulk.keys()][0];
|
|
586
|
+
console.error("[debug] builderBulk keys:", [...builderBulk.keys()]);
|
|
587
|
+
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
|
+
console.error("[debug] dockerOptsBulk keys:", [...dockerOptsBulk.keys()]);
|
|
591
|
+
}
|
|
582
592
|
const result = /* @__PURE__ */ new Map();
|
|
583
593
|
for (const app of builderBulk.keys()) {
|
|
584
594
|
result.set(app, buildConfigFromReports(
|