Merge pull request #85 from resin-io/72-use-defaults-not-extend-for-env

Ensure internal env vars are not overwritten

CHANGELOG.md

@@ -1,3 +1,4 @@
+* Use _.defaults instead of _.extend to ensure internal env vars are not overwritten [Pablo]
 * Expose resin API key to apps [Pablo]
 * On download start, set download_progress to 0. On finish, set state to Idle [Pablo]
 * Set GOARM separately for each architecture [Pablo]

src/utils.coffee

@@ -143,7 +143,7 @@ exports.extendEnvVars = (env, uuid) ->
 		RESIN: '1'
 		USER: 'root'
 	if env?
-		_.extend(newEnv, env)
+		_.defaults(newEnv, env)
 	return Promise.props(newEnv)
 
 # Callback function to enable/disable tcp pings