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

Add support for environment variables.

Browse Source 
Conflicts:
	src/application.coffee

Conflicts:
	src/application.coffee
This commit is contained in:
Page 2014-04-03 18:16:37 +01:00 committed by Pablo Carranza Vélez
parent 4157ab036c
commit 238768e7d4
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/application.coffee
View File

@ -69,6 +69,7 @@ exports.start = start = (app) ->
Cmd: ['/bin/bash', '-c', '/start web']
Volumes:
'/dev': {}
Env: env
)
.then (container) ->
console.log('Starting container:', app.imageId)
@ -96,6 +97,7 @@ exports.update = ->
resinAPI.get(
resource: 'application'
options:
expand: 'environment_variable'
filter:
'device/uuid': uuid
customOptions:
@ -105,8 +107,13 @@ exports.update = ->
console.log("Remote apps")
remoteApps = _.filter(remoteApps, 'commit')
remoteApps = _.map remoteApps, (app) ->
env = {}
if app.environment_variable?
for envVar in app.environment_variable
env[envVar.name] = envVar.value
return {
imageId: "#{REGISTRY_ENDPOINT}/#{path.basename(app.git_repository, '.git')}/#{app.commit}"
env: env
}
remoteApps = _.indexBy(remoteApps, 'imageId')
@ -114,7 +121,7 @@ exports.update = ->
console.log(remoteImages)
console.log("Local apps")
apps = _.map(apps, (app) -> _.pick(app, ['imageId']))
apps = _.map(apps, (app) -> _.pick(app, ['imageId', 'env']))
apps = _.indexBy(apps, 'imageId')
localImages = _.keys(apps)
console.log(localImages)
@ -127,6 +134,12 @@ exports.update = ->
toBeInstalled = _.difference(remoteImages, localImages)
console.log(toBeInstalled)
console.log("Apps to be updated")
toBeUpdated = _.intersection(remoteImages, localImages)
toBeUpdated = _.filter toBeUpdated, (imageId) ->
return _.isEqual(remoteApps[imageId], apps[imageId])
console.log(toBeUpdated)
# Install the apps and add each to the db as they succeed
promises = toBeInstalled.map (imageId) ->
app = remoteApps[imageId]

1
src/db.coffee
View File

@ -24,6 +24,7 @@ knex.init = Promise.all([
t.string('containerId')
t.string('imageId')
t.boolean('privileged')
t.json('env')
])
module.exports = knex