ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-06-17 23:38:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build, deploy: Fix processing of '--tag' option

Browse Source 
Change-type: patch
Resolves: #825
Resolves: #1018
This commit is contained in:
Paulo Castro
2021-09-09 01:22:32 +01:00
parent e03bbb7275
commit 305c9045f0
13 changed files with 164 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/commands/deploy.ts
View File

@ -34,7 +34,7 @@ import type {
ComposeOpts,
Release as ComposeReleaseInfo,
} from '../utils/compose-types';
import type { DockerCliFlags } from '../utils/docker';
import type { BuildOpts, DockerCliFlags } from '../utils/docker';
import {
applyReleaseTagKeysAndValues,
buildProject,
@ -245,7 +245,7 @@ ${dockerignoreHelp}
shouldPerformBuild: boolean;
shouldUploadLogs: boolean;
buildEmulated: boolean;
buildOpts: any; // arguments to forward to docker build command
buildOpts: BuildOpts;
createAsDraft: boolean;
},
) {
@ -259,7 +259,12 @@ ${dockerignoreHelp}
const appType = (opts.app?.application_type as ApplicationType[])?.[0];
try {
const project = await loadProject(logger, composeOpts, opts.image);
const project = await loadProject(
logger,
composeOpts,
opts.image,
opts.buildOpts.t,
);
if (project.descriptors.length > 1 && !appType?.supports_multicontainer) {
throw new ExpectedError(
'Target fleet does not support multiple containers. Aborting!',