From f2d5a597276e8a2618bf4642197e40c09b01f3ee Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Mon, 26 Feb 2018 17:39:45 -0800 Subject: [PATCH 1/2] Allow truthy values for deltas and lock override (i.e. the string 'true' besides '1') We had previously done this for all the other configuration variables, but for some reason we had missed these two. Change-Type: patch Signed-off-by: Pablo Carranza Velez --- src/application.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/application.coffee b/src/application.coffee index 6d61279e..f872cbf1 100644 --- a/src/application.coffee +++ b/src/application.coffee @@ -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, { From b6fc45b67194a656f1f5bd4901d6a0215efed54f Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Tue, 27 Feb 2018 18:27:22 +0000 Subject: [PATCH 2/2] v6.6.8 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7ced4fe..c5e53226 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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] diff --git a/package.json b/package.json index 390e2c4c..f1d1080e 100644 --- a/package.json +++ b/package.json @@ -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",