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

Auto-merge for PR #706 via VersionBot

Browse Source 
Update resin-preload to 5.0.0 to handle jetson-tx2
This commit is contained in:
resin-io-versionbot[bot] 2017-10-27 14:39:30 +00:00 committed by GitHub
commit d316f67367
5 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).
## v6.8.0 - 2017-10-27
* Allow preloading jetson-tx2 images, improve flasher images detection and remove the --dont-detect-flasher-type-images option. #706 [Alexis Svinartchouk]
## v6.7.4 - 2017-10-25
* Add preload to the CLI docs #702 [Tim Perry]

8
build/actions/preload.js
View File

@ -147,10 +147,6 @@ module.exports = {
parameter: 'splashImage.png',
description: 'path to a png image to replace the splash screen',
alias: 's'
}, {
signature: 'dont-detect-flasher-type-images',
boolean: true,
description: 'Disables the flasher type images detection: treats all images as non flasher types'
}, {
signature: 'dont-check-device-type',
boolean: true,
@ -197,8 +193,6 @@ module.exports = {
options.image = params.image;
options.appId = options.app;
delete options.app;
options.dontDetectFlasherTypeImages = options['dont-detect-flasher-type-images'];
delete options['dont-detect-flasher-type-images'];
options.splashImage = options['splash-image'];
delete options['splash-image'];
if (options['dont-check-device-type'] && !options.appId) {
@ -206,7 +200,7 @@ module.exports = {
}
return dockerUtils.getDocker(options).then(function(docker) {
var gotSignal, preloader;
preloader = new preload.Preloader(resin, docker, options.appId, options.commit, options.image, options.splashImage, options.proxy, options.dontDetectFlasherTypeImages);
preloader = new preload.Preloader(resin, docker, options.appId, options.commit, options.image, options.splashImage, options.proxy);
gotSignal = false;
nodeCleanup(function(exitCode, signal) {
if (signal) {

4
doc/cli.markdown
View File

@ -1101,10 +1101,6 @@ a specific application commit to preload, use "latest" to specify the latest com
path to a png image to replace the splash screen
#### --dont-detect-flasher-type-images
Disables the flasher type images detection: treats all images as non flasher types
#### --dont-check-device-type
Disables check for matching device types in image and application

9
lib/actions/preload.coffee
View File

@ -140,11 +140,6 @@ module.exports =
description: 'path to a png image to replace the splash screen'
alias: 's'
}
{
signature: 'dont-detect-flasher-type-images'
boolean: true
description: 'Disables the flasher type images detection: treats all images as non flasher types'
}
{
signature: 'dont-check-device-type'
boolean: true
@ -187,9 +182,6 @@ module.exports =
options.appId = options.app
delete options.app
options.dontDetectFlasherTypeImages = options['dont-detect-flasher-type-images']
delete options['dont-detect-flasher-type-images']
options.splashImage = options['splash-image']
delete options['splash-image']
@ -208,7 +200,6 @@ module.exports =
options.image,
options.splashImage,
options.proxy,
options.dontDetectFlasherTypeImages
)
gotSignal = false

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "resin-cli",
"version": "6.7.4",
"version": "6.8.0",
"description": "The official resin.io CLI tool",
"main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli",
@ -86,7 +86,7 @@
"resin-doodles": "0.0.1",
"resin-image-fs": "^2.3.0",
"resin-image-manager": "^5.0.0",
"resin-preload": "^4.0.9",
"resin-preload": "^5.0.0",
"resin-sdk": "^7.0.0",
"resin-sdk-preconfigured": "^6.9.0",
"resin-settings-client": "^3.6.1",