mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2025-06-01 15:20:51 +00:00
Use require to parse package.json for supervisor version
This commit is contained in:
parent
523a8b5637
commit
cdca01eed1
@ -52,7 +52,7 @@ knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
|
|||||||
|
|
||||||
api = require './api'
|
api = require './api'
|
||||||
application = require './application'
|
application = require './application'
|
||||||
supervisor = require './supervisor'
|
supervisor = require './supervisor-update'
|
||||||
|
|
||||||
console.log('Starting OpenVPN..')
|
console.log('Starting OpenVPN..')
|
||||||
openvpn = spawn('openvpn', [ 'client.conf' ], cwd: '/data')
|
openvpn = spawn('openvpn', [ 'client.conf' ], cwd: '/data')
|
||||||
@ -100,5 +100,5 @@ knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
|
|||||||
|
|
||||||
# Let API know we are running a new version
|
# Let API know we are running a new version
|
||||||
application.updateDeviceInfo(
|
application.updateDeviceInfo(
|
||||||
supervisor_version: supervisor.version
|
supervisor_version: utils.supervisorVersion
|
||||||
)
|
)
|
||||||
|
@ -9,7 +9,6 @@ config = require './config'
|
|||||||
csrgen = Promise.promisify require 'csr-gen'
|
csrgen = Promise.promisify require 'csr-gen'
|
||||||
request = Promise.promisify require 'request'
|
request = Promise.promisify require 'request'
|
||||||
PlatformAPI = require 'resin-platform-api/request'
|
PlatformAPI = require 'resin-platform-api/request'
|
||||||
supervisor = require './supervisor'
|
|
||||||
|
|
||||||
PLATFORM_ENDPOINT = url.resolve(config.apiEndpoint, '/ewa/')
|
PLATFORM_ENDPOINT = url.resolve(config.apiEndpoint, '/ewa/')
|
||||||
resinAPI = new PlatformAPI(PLATFORM_ENDPOINT)
|
resinAPI = new PlatformAPI(PLATFORM_ENDPOINT)
|
||||||
@ -64,7 +63,7 @@ module.exports = ->
|
|||||||
console.log('UUID:', uuid)
|
console.log('UUID:', uuid)
|
||||||
console.log('User ID:', userConfig.userId)
|
console.log('User ID:', userConfig.userId)
|
||||||
console.log('User:', userConfig.username)
|
console.log('User:', userConfig.username)
|
||||||
console.log('Supervisor Version:', supervisor.version)
|
console.log('Supervisor Version:', utils.supervisorVersion)
|
||||||
console.log('API key:', userConfig.apiKey)
|
console.log('API key:', userConfig.apiKey)
|
||||||
console.log('Application ID:', userConfig.applicationId)
|
console.log('Application ID:', userConfig.applicationId)
|
||||||
console.log('CSR :', keys.csr)
|
console.log('CSR :', keys.csr)
|
||||||
@ -104,7 +103,7 @@ module.exports = ->
|
|||||||
{ key: 'apiKey', value: userConfig.apiKey }
|
{ key: 'apiKey', value: userConfig.apiKey }
|
||||||
{ key: 'username', value: userConfig.username }
|
{ key: 'username', value: userConfig.username }
|
||||||
{ key: 'userId', value: userConfig.userId }
|
{ key: 'userId', value: userConfig.userId }
|
||||||
{ key: 'version', value: supervisor.version }
|
{ key: 'version', value: utils.supervisorVersion }
|
||||||
])
|
])
|
||||||
knex('app').truncate()
|
knex('app').truncate()
|
||||||
])
|
])
|
||||||
|
@ -1,15 +1,8 @@
|
|||||||
process.on 'uncaughtException', (e) ->
|
process.on 'uncaughtException', (e) ->
|
||||||
console.error('Got unhandled exception', e, e?.stack)
|
console.error('Got unhandled exception', e, e?.stack)
|
||||||
|
|
||||||
fs = require 'fs'
|
|
||||||
supervisor = require './supervisor-update'
|
supervisor = require './supervisor-update'
|
||||||
|
|
||||||
# Parses package.json and returns resin-supervisor's version
|
|
||||||
supervisor.version = version = do ->
|
|
||||||
packageJson = fs.readFileSync(__dirname + '/../package.json', 'utf-8')
|
|
||||||
obj = JSON.parse packageJson
|
|
||||||
return obj.version
|
|
||||||
|
|
||||||
# Make sure the supervisor-update has initialised before we continue, as it will handle restarting to add mounts if
|
# Make sure the supervisor-update has initialised before we continue, as it will handle restarting to add mounts if
|
||||||
# necessary.
|
# necessary.
|
||||||
supervisor.initialised.then ->
|
supervisor.initialised.then ->
|
||||||
@ -26,5 +19,3 @@ supervisor.initialised.then ->
|
|||||||
# Wait for the DB schema to be created
|
# Wait for the DB schema to be created
|
||||||
knex.init.then ->
|
knex.init.then ->
|
||||||
require('./app')
|
require('./app')
|
||||||
|
|
||||||
module.exports = exports = supervisor
|
|
||||||
|
@ -5,6 +5,9 @@ config = require './config'
|
|||||||
mixpanel = require 'mixpanel'
|
mixpanel = require 'mixpanel'
|
||||||
request = Promise.promisifyAll require 'request'
|
request = Promise.promisifyAll require 'request'
|
||||||
|
|
||||||
|
# Parses package.json and returns resin-supervisor's version
|
||||||
|
exports.supervisorVersion = require('../package.json').version
|
||||||
|
|
||||||
mixpanelClient = mixpanel.init(config.mixpanelToken)
|
mixpanelClient = mixpanel.init(config.mixpanelToken)
|
||||||
|
|
||||||
exports.mixpanelProperties = mixpanelProperties =
|
exports.mixpanelProperties = mixpanelProperties =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user