ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-01 08:47:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #628 via VersionBot

Browse Source 
Properly propagate delta failure
This commit is contained in:
resin-io-versionbot[bot] 2018-04-18 18:40:19 +00:00 committed by GitHub
commit 0e6252d60b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 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! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## v7.4.2 - 2018-04-18
* Properly propagate delta failure #628 [Akis Kesoglou]
## v7.4.1 - 2018-04-11 ## v7.4.1 - 2018-04-11
* Allow services (and their images) to expose udp ports besides tcp #622 [Pablo Carranza Velez] * Allow services (and their images) to expose udp ports besides tcp #622 [Pablo Carranza Velez]

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "name": "resin-supervisor",
"description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
"version": "7.4.1", "version": "7.4.2",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

4
src/lib/docker-utils.coffee
View File

@ -24,7 +24,9 @@ applyDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress) ->
deltaStream = dockerDelta.applyDelta(imgSrc, timeout: applyTimeout) deltaStream = dockerDelta.applyDelta(imgSrc, timeout: applyTimeout)
res.pipe(deltaStream) res.pipe(deltaStream)
.on('id', (id) -> resolve('sha256:' + id)) .on('id', (id) -> resolve('sha256:' + id))
.on('error', req.abort.bind(req)) .on 'error', (err) ->
req.abort()
reject(err)
module.exports = class DockerUtils extends DockerToolbelt module.exports = class DockerUtils extends DockerToolbelt
constructor: (opts) -> constructor: (opts) ->