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

Added --squash option to resin build command

Browse Source
This commit is contained in:
Jacinto Arias 2017-06-23 17:20:16 +02:00 committed by Tim Perry
parent abebf6b4f4
commit bea7b2035a
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/utils/docker.js
View File

@ -53,6 +53,10 @@ exports.appendOptions = function(opts) {
description: 'Run an emulated build using Qemu', description: 'Run an emulated build using Qemu',
boolean: true, boolean: true,
alias: 'e' alias: 'e'
}, {
signature: 'squash',
description: 'Squash newly built layers into a single new layer',
boolean: true
} }
]); ]);
}; };
@ -280,6 +284,9 @@ exports.runBuild = function(params, options, getBundleInfo, logStreams) {
return logging.logWarn(logStreams, "Could not parse variable: '" + arg + "'"); return logging.logWarn(logStreams, "Could not parse variable: '" + arg + "'");
}); });
} }
if (options.squash != null) {
opts['squash'] = true;
}
return builder.createBuildStream(opts, hooks, reject); return builder.createBuildStream(opts, hooks, reject);
}); });
}); });

8
doc/cli.markdown
View File

@ -1406,6 +1406,10 @@ Don't use docker layer caching when building
Run an emulated build using Qemu Run an emulated build using Qemu
#### --squash
Squash newly built layers into a single new layer
## deploy <appName> [image] ## deploy <appName> [image]
Use this command to deploy an image to an application, optionally building it first. Use this command to deploy an image to an application, optionally building it first.
@ -1473,6 +1477,10 @@ Don't use docker layer caching when building
Run an emulated build using Qemu Run an emulated build using Qemu
#### --squash
Squash newly built layers into a single new layer
# Utilities # Utilities
## util available-drives ## util available-drives

7
lib/utils/docker.coffee
View File

@ -66,6 +66,11 @@ exports.appendOptions = (opts) ->
description: 'Run an emulated build using Qemu' description: 'Run an emulated build using Qemu'
boolean: true boolean: true
alias: 'e' alias: 'e'
},
{
signature: 'squash'
description: 'Squash newly built layers into a single new layer'
boolean: true
} }
] ]
@ -290,6 +295,8 @@ exports.runBuild = (params, options, getBundleInfo, logStreams) ->
if options.buildArg? if options.buildArg?
opts['buildargs'] = parseBuildArgs options.buildArg, (arg) -> opts['buildargs'] = parseBuildArgs options.buildArg, (arg) ->
logging.logWarn(logStreams, "Could not parse variable: '#{arg}'") logging.logWarn(logStreams, "Could not parse variable: '#{arg}'")
if options.squash?
opts['squash'] = true
builder.createBuildStream(opts, hooks, reject) builder.createBuildStream(opts, hooks, reject)