ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-21 17:56:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move promise.spread to promise.join for clarity (from review)

Browse Source
This commit is contained in:
Tim Perry 2017-06-15 12:34:26 +02:00
parent cf7bf2cb7d
commit a29b40eefa
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/utils/docker.js
View File

@ -279,7 +279,7 @@ exports.bufferImage = function(docker, imageId, bufferFile) {
streamUtils = require('./streams'); streamUtils = require('./streams');
image = docker.getImage(imageId); image = docker.getImage(imageId);
imageMetadata = image.inspectAsync(); imageMetadata = image.inspectAsync();
return Promise.all([image.get(), imageMetadata.get('Size')]).spread(function(imageStream, imageSize) { return Promise.join(image.get(), imageMetadata.get('Size'), function(imageStream, imageSize) {
return streamUtils.buffer(imageStream, bufferFile).tap(function(bufferedStream) { return streamUtils.buffer(imageStream, bufferFile).tap(function(bufferedStream) {
return bufferedStream.length = imageSize; return bufferedStream.length = imageSize;
}); });

3
lib/utils/docker.coffee
View File

@ -290,8 +290,7 @@ exports.bufferImage = (docker, imageId, bufferFile) ->
image = docker.getImage(imageId) image = docker.getImage(imageId)
imageMetadata = image.inspectAsync() imageMetadata = image.inspectAsync()
Promise.all([image.get(), imageMetadata.get('Size')]) Promise.join image.get(), imageMetadata.get('Size'), (imageStream, imageSize) ->
.spread (imageStream, imageSize) ->
streamUtils.buffer(imageStream, bufferFile) streamUtils.buffer(imageStream, bufferFile)
.tap (bufferedStream) -> .tap (bufferedStream) ->
bufferedStream.length = imageSize bufferedStream.length = imageSize