ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-21 22:47:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix project directory validation for 'balena deploy' with pre-built image

Browse Source 
Change-type: patch
This commit is contained in:
Paulo Castro 2020-04-02 19:44:27 +01:00
parent ff319d67f3
commit 96e28f3d45
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/actions/deploy.coffee
View File

@ -198,7 +198,7 @@ module.exports =
require('events').defaultMaxListeners = 1000 require('events').defaultMaxListeners = 1000
sdk = getBalenaSdk() sdk = getBalenaSdk()
{ ExpectedError } = require('../errors') { ExpectedError } = require('../errors')
{ validateProjectDirectory } = require('../utils/compose_ts') { getRegistrySecrets, validateProjectDirectory } = require('../utils/compose_ts')
helpers = require('../utils/helpers') helpers = require('../utils/helpers')
Logger = require('../utils/logger') Logger = require('../utils/logger')
@ -225,6 +225,11 @@ module.exports =
if image? and options.build if image? and options.build
throw new ExpectedError('Build option is not applicable when specifying an image') throw new ExpectedError('Build option is not applicable when specifying an image')
.then -> .then ->
if image
getRegistrySecrets(sdk, options['registry-secrets'])
.then (registrySecrets) ->
options['registry-secrets'] = registrySecrets
else
validateProjectDirectory(sdk, { validateProjectDirectory(sdk, {
dockerfilePath: options.dockerfile, dockerfilePath: options.dockerfile,
noParentCheck: options['noparent-check'] || false, noParentCheck: options['noparent-check'] || false,
@ -234,7 +239,7 @@ module.exports =
.then ({ dockerfilePath, registrySecrets }) -> .then ({ dockerfilePath, registrySecrets }) ->
options.dockerfile = dockerfilePath options.dockerfile = dockerfilePath
options['registry-secrets'] = registrySecrets options['registry-secrets'] = registrySecrets
.then ->
Promise.join( Promise.join(
helpers.getApplication(appName) helpers.getApplication(appName)
helpers.getArchAndDeviceType(appName) helpers.getArchAndDeviceType(appName)