Auto-merge for PR #595 via VersionBot

Trim whitespace from the hostname file on the host before passing it …

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.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
 
 * Document that the update lock can be forced on reboots and shutdowns #591 [Pablo Carranza Velez]

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

src/application-manager.coffee

@@ -799,7 +799,7 @@ module.exports = class ApplicationManager extends EventEmitter
 				firmware: pathExistsOnHost('/lib/firmware')
 				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) =>
 				configOpts = {
 					appName: app.name