From 7ea48683bea9bab6fcfae04a4f34a4d724b47aaa Mon Sep 17 00:00:00 2001 From: Cameron Diver Date: Wed, 25 Jul 2018 15:45:18 +0100 Subject: [PATCH 1/2] Fix: Fix scoping issue with variables in service-manager Change-type: patch Signed-off-by: Cameron Diver --- src/compose/service-manager.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compose/service-manager.coffee b/src/compose/service-manager.coffee index dd65be9d..80a6643e 100644 --- a/src/compose/service-manager.coffee +++ b/src/compose/service-manager.coffee @@ -101,13 +101,13 @@ module.exports = class ServiceManager extends EventEmitter return @docker.getContainer(existingService.containerId) .catch NotFoundError, => + conf = service.toContainerConfig() + nets = service.extraNetworksToJoin() + @config.get('name') .then (deviceName) => service.environment['RESIN_DEVICE_NAME_AT_INIT'] = deviceName - conf = service.toContainerConfig() - nets = service.extraNetworksToJoin() - @logger.logSystemEvent(logTypes.installService, { service }) @reportNewStatus(mockContainerId, service, 'Installing') From 8cad3a664cb64281b3438d725f0f7110158e3ce6 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Wed, 25 Jul 2018 14:57:58 +0000 Subject: [PATCH 2/2] v7.16.2 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92e3547c..8f1ca502 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.16.2 - 2018-07-25 + +* Fix: Fix scoping issue with variables in service-manager #711 [Cameron Diver] + ## v7.16.1 - 2018-07-25 * Dont restart service on device name change #704 [Cameron Diver] diff --git a/package.json b/package.json index 10354d64..6c7ad5d6 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.16.1", + "version": "7.16.2", "license": "Apache-2.0", "repository": { "type": "git",