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

Merge pull request #307 from resin-io/fix-getimageenv

Browse Source 
Fix docker utils getImageEnv by correctly parsing the returned array
This commit is contained in:
Pablo Carranza Vélez 2016-10-10 18:59:50 -03:00 committed by GitHub
commit 2331cc7d70
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,3 +1,4 @@
* Fix docker utils getImageEnv by correctly parsing the returned array [Pablo]
* Avoid installing npm dependencies twice [Pablo] * Avoid installing npm dependencies twice [Pablo]
* Updated to bluebird 3 [Page] * Updated to bluebird 3 [Page]
* Better parameter handling in PUT /v1/devices/:uuid [Pablo] * Better parameter handling in PUT /v1/devices/:uuid [Pablo]

6
src/docker-utils.coffee
View File

@ -384,6 +384,12 @@ do ->
exports.getImageEnv = (id) -> exports.getImageEnv = (id) ->
docker.getImage(id).inspectAsync() docker.getImage(id).inspectAsync()
.get('Config').get('Env') .get('Config').get('Env')
.then (env) ->
# env is an array of strings that say 'key=value'
_(env)
.invokeMap('split', '=')
.fromPairs()
.value()
.catch (err) -> .catch (err) ->
console.log('Error getting env from image', err, err.stack) console.log('Error getting env from image', err, err.stack)
return {} return {}