ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-04-08 11:54:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1694 from balena-io/fix-project-validation-deploy

Browse Source 
Fix project directory validation for 'balena deploy' with pre-built image
This commit is contained in:
Paulo Castro 2020-04-02 20:23:02 +01:00 committed by GitHub
commit dcb1c11700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/actions/deploy.coffee
View File

@ -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)