@joltdesign/scripts 0.10.0 → 0.10.1
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/Command/Docker.js
CHANGED
|
@@ -38,22 +38,22 @@ export class DockerBuildCommand extends DockerCommand {
|
|
|
38
38
|
return result.exitCode;
|
|
39
39
|
}
|
|
40
40
|
async buildCommandArgs() {
|
|
41
|
-
|
|
42
|
-
const { config, dev } = this;
|
|
41
|
+
const { buildArgs, config, dev } = this;
|
|
43
42
|
const imageName = await config.getDockerImageName(dev);
|
|
44
43
|
const platform = await config.get('buildPlatform');
|
|
45
44
|
const context = await config.get('buildContext');
|
|
46
45
|
const dockerFile = await config.get('dockerFile');
|
|
47
|
-
const
|
|
46
|
+
const parsedBuildArgs = await Promise.all((buildArgs || []).map((x) => config.parseArg(x)));
|
|
47
|
+
const additionalBuildArgs = (parsedBuildArgs === null || parsedBuildArgs === void 0 ? void 0 : parsedBuildArgs.map((x) => `--build-arg=${x}`)) || [];
|
|
48
48
|
const devBuildArg = dev ? '--build-arg=DEVBUILD=1' : '';
|
|
49
|
-
const
|
|
49
|
+
const allBuildArgs = [devBuildArg, ...additionalBuildArgs];
|
|
50
50
|
return [
|
|
51
51
|
'buildx',
|
|
52
52
|
'build',
|
|
53
53
|
platform && `--platform=${platform}`,
|
|
54
54
|
dockerFile && `-f ${dockerFile}`,
|
|
55
55
|
`-t ${imageName}`,
|
|
56
|
-
...
|
|
56
|
+
...allBuildArgs,
|
|
57
57
|
context !== null && context !== void 0 ? context : '.',
|
|
58
58
|
]
|
|
59
59
|
.filter((x) => !!x)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Docker.js","sourceRoot":"","sources":["../../src/Command/Docker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAA;AAClC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AACzC,OAAO,OAAO,MAAM,SAAS,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,WAAW,MAAM,kBAAkB,CAAA;AAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;AAEzB,MAAM,OAAgB,aAAc,SAAQ,WAAW;IAAvD;;QACE,qBAAgB,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC7B,QAAG,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACtC,CAAC;CAAA;AAED,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IAArD;;QAGE,cAAS,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Docker.js","sourceRoot":"","sources":["../../src/Command/Docker.ts"],"names":[],"mappings":"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"}
|