ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-24 07:46:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #595 via VersionBot

Browse Source 
Trim whitespace from the hostname file on the host before passing it …
This commit is contained in:
resin-io-versionbot[bot] 2018-03-19 21:09:13 +00:00 committed by GitHub
commit a2f0cacf19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 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.1.18 - 2018-03-19
* Trim whitespace from the hostname file on the host before passing it as the hostname for containers with host network #595 [Pablo Carranza Velez]
## v7.1.17 - 2018-03-19 ## v7.1.17 - 2018-03-19
* Document that the update lock can be forced on reboots and shutdowns #591 [Pablo Carranza Velez] * Document that the update lock can be forced on reboots and shutdowns #591 [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.1.17", "version": "7.1.18",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

2
src/application-manager.coffee
View File

@ -799,7 +799,7 @@ module.exports = class ApplicationManager extends EventEmitter
firmware: pathExistsOnHost('/lib/firmware') firmware: pathExistsOnHost('/lib/firmware')
modules: pathExistsOnHost('/lib/modules') modules: pathExistsOnHost('/lib/modules')
}) })
fs.readFileAsync(path.join(constants.rootMountPoint, '/etc/hostname')).then(String) fs.readFileAsync(path.join(constants.rootMountPoint, '/etc/hostname'), 'utf8').then(_.trim)
(opts, supervisorApiHost, hostPathExists, hostnameOnHost) => (opts, supervisorApiHost, hostPathExists, hostnameOnHost) =>
configOpts = { configOpts = {
appName: app.name appName: app.name