mirror of
https://github.com/balena-io/balena-cli.git
synced 2024-12-19 05:37:51 +00:00
Fix project directory validation for 'balena deploy' with pre-built image
Change-type: patch
This commit is contained in:
parent
ff319d67f3
commit
96e28f3d45
@ -198,7 +198,7 @@ module.exports =
|
||||
require('events').defaultMaxListeners = 1000
|
||||
sdk = getBalenaSdk()
|
||||
{ ExpectedError } = require('../errors')
|
||||
{ validateProjectDirectory } = require('../utils/compose_ts')
|
||||
{ getRegistrySecrets, validateProjectDirectory } = require('../utils/compose_ts')
|
||||
helpers = require('../utils/helpers')
|
||||
Logger = require('../utils/logger')
|
||||
|
||||
@ -225,16 +225,21 @@ module.exports =
|
||||
if image? and options.build
|
||||
throw new ExpectedError('Build option is not applicable when specifying an image')
|
||||
.then ->
|
||||
validateProjectDirectory(sdk, {
|
||||
dockerfilePath: options.dockerfile,
|
||||
noParentCheck: options['noparent-check'] || false,
|
||||
projectPath: options.source || '.',
|
||||
registrySecretsPath: options['registry-secrets'],
|
||||
})
|
||||
.then ({ dockerfilePath, registrySecrets }) ->
|
||||
options.dockerfile = dockerfilePath
|
||||
options['registry-secrets'] = registrySecrets
|
||||
|
||||
if image
|
||||
getRegistrySecrets(sdk, options['registry-secrets'])
|
||||
.then (registrySecrets) ->
|
||||
options['registry-secrets'] = registrySecrets
|
||||
else
|
||||
validateProjectDirectory(sdk, {
|
||||
dockerfilePath: options.dockerfile,
|
||||
noParentCheck: options['noparent-check'] || false,
|
||||
projectPath: options.source || '.',
|
||||
registrySecretsPath: options['registry-secrets'],
|
||||
})
|
||||
.then ({ dockerfilePath, registrySecrets }) ->
|
||||
options.dockerfile = dockerfilePath
|
||||
options['registry-secrets'] = registrySecrets
|
||||
.then ->
|
||||
Promise.join(
|
||||
helpers.getApplication(appName)
|
||||
helpers.getArchAndDeviceType(appName)
|
||||
|
Loading…
Reference in New Issue
Block a user