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

Auto-merge for PR #711 via VersionBot

Browse Source 
Fix: Fix scoping issue with variables in service-manager
This commit is contained in:
resin-io-versionbot[bot] 2018-07-25 15:12:24 +00:00 committed by GitHub
commit 59d54b92e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 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.16.2 - 2018-07-25
* Fix: Fix scoping issue with variables in service-manager #711 [Cameron Diver]
## v7.16.1 - 2018-07-25 ## v7.16.1 - 2018-07-25
* Dont restart service on device name change #704 [Cameron Diver] * Dont restart service on device name change #704 [Cameron Diver]

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.16.1", "version": "7.16.2",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

6
src/compose/service-manager.coffee
View File

@ -101,13 +101,13 @@ module.exports = class ServiceManager extends EventEmitter
return @docker.getContainer(existingService.containerId) return @docker.getContainer(existingService.containerId)
.catch NotFoundError, => .catch NotFoundError, =>
conf = service.toContainerConfig()
nets = service.extraNetworksToJoin()
@config.get('name') @config.get('name')
.then (deviceName) => .then (deviceName) =>
service.environment['RESIN_DEVICE_NAME_AT_INIT'] = deviceName service.environment['RESIN_DEVICE_NAME_AT_INIT'] = deviceName
conf = service.toContainerConfig()
nets = service.extraNetworksToJoin()
@logger.logSystemEvent(logTypes.installService, { service }) @logger.logSystemEvent(logTypes.installService, { service })
@reportNewStatus(mockContainerId, service, 'Installing') @reportNewStatus(mockContainerId, service, 'Installing')