From 1cde9dd16d9ffc0649a06610e0de08e367cb0415 Mon Sep 17 00:00:00 2001 From: Akis Kesoglou Date: Wed, 18 Apr 2018 18:27:57 +0300 Subject: [PATCH 1/2] Properly propagate delta failure Change-Type: patch Closes: #627 --- src/lib/docker-utils.coffee | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/docker-utils.coffee b/src/lib/docker-utils.coffee index 264fc6d6..7e715a4c 100644 --- a/src/lib/docker-utils.coffee +++ b/src/lib/docker-utils.coffee @@ -24,7 +24,9 @@ applyDelta = (imgSrc, deltaUrl, applyTimeout, opts, onProgress) -> deltaStream = dockerDelta.applyDelta(imgSrc, timeout: applyTimeout) res.pipe(deltaStream) .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 constructor: (opts) -> From 074eabe72d15c44e9606eed5a83603c17ea6aebd Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Wed, 18 Apr 2018 16:08:16 +0000 Subject: [PATCH 2/2] v7.4.2 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49b5d969..b603599d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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/). +## v7.4.2 - 2018-04-18 + +* Properly propagate delta failure #628 [Akis Kesoglou] + ## v7.4.1 - 2018-04-11 * Allow services (and their images) to expose udp ports besides tcp #622 [Pablo Carranza Velez] diff --git a/package.json b/package.json index 0817c52f..256970dd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "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.", - "version": "7.4.1", + "version": "7.4.2", "license": "Apache-2.0", "repository": { "type": "git",