@solid-stack/builder 1.1.5 → 1.1.6
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileEnvironment.d.ts","sourceRoot":"","sources":["../../src/core/compileEnvironment.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAarD,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB,gBAChB,WAAW,eACZ,MAAM,YACT,yBAAyB,KACjC,
|
|
1
|
+
{"version":3,"file":"compileEnvironment.d.ts","sourceRoot":"","sources":["../../src/core/compileEnvironment.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAarD,MAAM,WAAW,yBAAyB;IACxC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,IAAI,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,kBAAkB,gBAChB,WAAW,eACZ,MAAM,YACT,yBAAyB,KACjC,MAkXF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileMeshEnvironment.d.ts","sourceRoot":"","sources":["../../../src/core/mesh/compileMeshEnvironment.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,KAAK,GAAG,MAAM,EACpB,UAAU,GAAE,MAAsB,EAClC,OAAO,GAAE,kBAAuB,GAC/B,iBAAiB,
|
|
1
|
+
{"version":3,"file":"compileMeshEnvironment.d.ts","sourceRoot":"","sources":["../../../src/core/mesh/compileMeshEnvironment.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACpC,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,KAAK,GAAG,MAAM,EACpB,UAAU,GAAE,MAAsB,EAClC,OAAO,GAAE,kBAAuB,GAC/B,iBAAiB,CA+1BnB"}
|
package/dist/index.js
CHANGED
|
@@ -1240,12 +1240,13 @@ function compileMeshEnvironment(mode, rawMeshDir = process.cwd(), options = {})
|
|
|
1240
1240
|
let overrideVolumes = [];
|
|
1241
1241
|
let overrideHealthcheck = void 0;
|
|
1242
1242
|
let overrideCommand = void 0;
|
|
1243
|
+
let overrideApp = void 0;
|
|
1243
1244
|
const stageOverride = serviceOverrides[mode];
|
|
1244
1245
|
if (stageOverride && existsSync(stageOverride.path)) {
|
|
1245
1246
|
try {
|
|
1246
1247
|
const overrideYaml = parse(readFileSync(stageOverride.path, "utf-8"));
|
|
1247
1248
|
mergeTopLevelResources(overrideYaml);
|
|
1248
|
-
|
|
1249
|
+
overrideApp = overrideYaml?.services?.app || overrideYaml?.services?.[serviceName];
|
|
1249
1250
|
if (!overrideApp && overrideYaml?.services && Object.keys(overrideYaml.services).length > 0) {
|
|
1250
1251
|
throw new ScriptError(
|
|
1251
1252
|
`Override file "${stageOverride.path}" must define service "app" or "${serviceName}".`
|
|
@@ -1285,16 +1286,41 @@ function compileMeshEnvironment(mode, rawMeshDir = process.cwd(), options = {})
|
|
|
1285
1286
|
}
|
|
1286
1287
|
}
|
|
1287
1288
|
environment.PORT = String(INTERNAL_PORT);
|
|
1289
|
+
const buildArgs = {};
|
|
1290
|
+
if (overrideApp?.build?.args) {
|
|
1291
|
+
if (Array.isArray(overrideApp.build.args)) {
|
|
1292
|
+
for (const item of overrideApp.build.args) {
|
|
1293
|
+
if (typeof item === "string") {
|
|
1294
|
+
const eqIdx = item.indexOf("=");
|
|
1295
|
+
if (eqIdx !== -1) {
|
|
1296
|
+
buildArgs[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
|
|
1297
|
+
} else {
|
|
1298
|
+
buildArgs[item] = process.env[item] ?? null;
|
|
1299
|
+
}
|
|
1300
|
+
}
|
|
1301
|
+
}
|
|
1302
|
+
} else if (typeof overrideApp.build.args === "object") {
|
|
1303
|
+
Object.assign(buildArgs, overrideApp.build.args);
|
|
1304
|
+
}
|
|
1305
|
+
}
|
|
1306
|
+
if (serviceBuildJson.envOverrides) {
|
|
1307
|
+
for (const [k, v] of Object.entries(serviceBuildJson.envOverrides)) {
|
|
1308
|
+
buildArgs[k] = interpolateEnvTemplates(v, `Service build.json: ${serviceName}`);
|
|
1309
|
+
}
|
|
1310
|
+
}
|
|
1288
1311
|
if (serviceConfig.envOverrides) {
|
|
1289
1312
|
for (const [k, v] of Object.entries(serviceConfig.envOverrides)) {
|
|
1290
|
-
|
|
1313
|
+
const interpolated = interpolateEnvTemplates(v, `Service: ${serviceName}`);
|
|
1314
|
+
environment[k] = interpolated;
|
|
1315
|
+
buildArgs[k] = interpolated;
|
|
1291
1316
|
}
|
|
1292
1317
|
}
|
|
1293
1318
|
const serviceDef = {
|
|
1294
1319
|
build: {
|
|
1295
1320
|
context: relServiceDir,
|
|
1296
1321
|
dockerfile,
|
|
1297
|
-
target: mode
|
|
1322
|
+
target: mode,
|
|
1323
|
+
...Object.keys(buildArgs).length > 0 ? { args: buildArgs } : {}
|
|
1298
1324
|
},
|
|
1299
1325
|
init: true,
|
|
1300
1326
|
logging: {
|
|
@@ -2802,16 +2828,51 @@ ${explanation}`);
|
|
|
2802
2828
|
serviceConfig.environment = {};
|
|
2803
2829
|
}
|
|
2804
2830
|
};
|
|
2831
|
+
const normalizeBuildArgs = (serviceConfig) => {
|
|
2832
|
+
if (typeof serviceConfig.build === "string") {
|
|
2833
|
+
serviceConfig.build = {
|
|
2834
|
+
context: serviceConfig.build
|
|
2835
|
+
};
|
|
2836
|
+
}
|
|
2837
|
+
if (serviceConfig.build && typeof serviceConfig.build === "object") {
|
|
2838
|
+
if (Array.isArray(serviceConfig.build.args)) {
|
|
2839
|
+
const argsObj = {};
|
|
2840
|
+
for (const item of serviceConfig.build.args) {
|
|
2841
|
+
if (typeof item === "string") {
|
|
2842
|
+
const eqIdx = item.indexOf("=");
|
|
2843
|
+
if (eqIdx !== -1) {
|
|
2844
|
+
argsObj[item.slice(0, eqIdx)] = item.slice(eqIdx + 1);
|
|
2845
|
+
} else {
|
|
2846
|
+
argsObj[item] = process.env[item] ?? null;
|
|
2847
|
+
}
|
|
2848
|
+
}
|
|
2849
|
+
}
|
|
2850
|
+
serviceConfig.build.args = argsObj;
|
|
2851
|
+
} else if (!serviceConfig.build.args || typeof serviceConfig.build.args !== "object") {
|
|
2852
|
+
serviceConfig.build.args = {};
|
|
2853
|
+
}
|
|
2854
|
+
}
|
|
2855
|
+
};
|
|
2805
2856
|
if (buildJson.envOverrides && yml.services && yml.services.app) {
|
|
2806
2857
|
normalizeEnvironment(yml.services.app);
|
|
2858
|
+
normalizeBuildArgs(yml.services.app);
|
|
2807
2859
|
for (const [k, v] of Object.entries(buildJson.envOverrides)) {
|
|
2808
|
-
|
|
2860
|
+
const val = interpolateEnv(v, "App EnvOverrides");
|
|
2861
|
+
yml.services.app.environment[k] = val;
|
|
2862
|
+
if (yml.services.app.build?.args) {
|
|
2863
|
+
yml.services.app.build.args[k] = val;
|
|
2864
|
+
}
|
|
2809
2865
|
}
|
|
2810
2866
|
}
|
|
2811
2867
|
if (buildJson.tester?.envOverrides && yml.services && yml.services.tester) {
|
|
2812
2868
|
normalizeEnvironment(yml.services.tester);
|
|
2869
|
+
normalizeBuildArgs(yml.services.tester);
|
|
2813
2870
|
for (const [k, v] of Object.entries(buildJson.tester.envOverrides)) {
|
|
2814
|
-
|
|
2871
|
+
const val = interpolateEnv(v, "Tester EnvOverrides");
|
|
2872
|
+
yml.services.tester.environment[k] = val;
|
|
2873
|
+
if (yml.services.tester.build?.args) {
|
|
2874
|
+
yml.services.tester.build.args[k] = val;
|
|
2875
|
+
}
|
|
2815
2876
|
}
|
|
2816
2877
|
}
|
|
2817
2878
|
if (yml.services) {
|