ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-21 01:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build/deploy: Fix --buildArg option with docker-compose.yml projects

Browse Source 
Resolves: #1053
Change-type: patch
This commit is contained in:
Paulo Castro 2020-10-19 02:10:12 +01:00
parent 4c8dc29946
commit 3199f15662
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/utils/compose_ts.ts
View File

@ -313,14 +313,23 @@ function setTaskAttributes({
// multibuild (splitBuildStream) parses the composition internally so
// any tags we've set before are lost; re-assign them here
task.tag ??= [projectName, task.serviceName].join('_').toLowerCase();
task.dockerOpts ??= {};
if (isBuildConfig(d.image)) {
d.image.tag = task.tag;
if (d.image.args) {
task.dockerOpts.buildargs ??= {};
_.merge(task.dockerOpts.buildargs, d.image.args);
}
}
// reassign task.args so that the `--buildArg` flag takes precedence
// over assignments in the docker-compose.yml file (service.build.args)
task.args = {
...task.args,
...buildOpts.buildargs,
};
// Docker image build options
task.dockerOpts ??= {};
if (task.args && Object.keys(task.args).length) {
task.dockerOpts.buildargs = {
...task.dockerOpts.buildargs,
...task.args,
};
}
_.merge(task.dockerOpts, buildOpts, { t: task.tag });
}