ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-21 03:55:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #561 via VersionBot

Browse Source 
Allow truthy values for deltas and lock override (i.e. the string 'tr…
This commit is contained in:
resin-io-versionbot[bot] 2018-02-27 18:42:22 +00:00 committed by GitHub
commit cea1a4b781
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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/).
## v6.6.8 - 2018-02-27
* Allow truthy values for deltas and lock override (i.e. the string 'true' besides '1') #561 [Pablo Carranza Velez]
## v6.6.7 - 2018-02-27
* Since armel builds are disabled, do not pull an armel node base image, and ensure we never deploy an armel supervisor #560 [Pablo Carranza Velez]

2
package.json
View File

@ -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": "6.6.7",
"version": "6.6.8",
"license": "Apache-2.0",
"repository": {
"type": "git",

6
src/application.coffee
View File

@ -242,7 +242,7 @@ fetch = (app, { deltaSource, setDeviceUpdateState = true } = {}) ->
Promise.try ->
conf = JSON.parse(app.config)
Promise.join utils.getConfig('apiKey'), utils.getConfig('uuid'), (apiKey, uuid) ->
if conf['RESIN_SUPERVISOR_DELTA'] == '1'
if checkTruthy(conf['RESIN_SUPERVISOR_DELTA'])
logSystemEvent(logTypes.downloadAppDelta, app)
deltaOpts = {
uuid, apiKey, deltaSource
@ -834,8 +834,8 @@ application.update = update = (force, scheduled = false) ->
app = remoteApps[appId]
conf = JSON.parse(app.config)
forceThisApp =
conf['RESIN_SUPERVISOR_OVERRIDE_LOCK'] == '1' ||
conf['RESIN_OVERRIDE_LOCK'] == '1'
checkTruthy(conf['RESIN_SUPERVISOR_OVERRIDE_LOCK']) ||
checkTruthy(conf['RESIN_OVERRIDE_LOCK'])
strategy = conf['RESIN_SUPERVISOR_UPDATE_STRATEGY']
timeout = conf['RESIN_SUPERVISOR_HANDOVER_TIMEOUT']
updateUsingStrategy strategy, {