ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-20 11:38:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix default volume name in migrations, and do not use the legacy-container flag on containers from older supervisors (they'll be restarted anyways)

Browse Source 
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez 2018-02-20 08:11:34 -08:00
parent 58fede2976
commit bb57bcc37c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/migrations/20171129064057_multicontainer.js
View File

@ -1,8 +1,4 @@
var defaultLegacyVolume = function (appId) {
return `resin-app-${appId}`
}
var tryParse = function (obj) { var tryParse = function (obj) {
try { try {
return JSON.parse(obj) return JSON.parse(obj)
@ -32,7 +28,7 @@ var singleToMulticontainerApp = function (app) {
networks: {}, networks: {},
volumes: {} volumes: {}
} }
const defaultVolume = defaultLegacyVolume(appId) const defaultVolume = 'resin-data'
newApp.volumes[defaultVolume] = {} newApp.volumes[defaultVolume] = {}
let updateStrategy = conf['RESIN_SUPERVISOR_UPDATE_STRATEGY'] let updateStrategy = conf['RESIN_SUPERVISOR_UPDATE_STRATEGY']
if (updateStrategy == null) { if (updateStrategy == null) {
@ -68,7 +64,6 @@ var singleToMulticontainerApp = function (app) {
'io.resin.features.resin-api': '1', 'io.resin.features.resin-api': '1',
'io.resin.update.strategy': updateStrategy, 'io.resin.update.strategy': updateStrategy,
'io.resin.update.handover-timeout': handoverTimeout, 'io.resin.update.handover-timeout': handoverTimeout,
'io.resin.legacy-container': '1'
}, },
environment: environment, environment: environment,
restart: restartPolicy, restart: restartPolicy,