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

fix: Don't consider volume supervised labels when comparing

Browse Source 
Change-type: patch
Closes: #1039
Signed-off-by: Cameron Diver <cameron@balena.io>
This commit is contained in:
Cameron Diver 2019-07-18 14:29:44 +01:00
parent 9ad2a6a343
commit cbb079e8dc
No known key found for this signature in database
GPG Key ID: 49690ED87032539F
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compose/volume.ts
View File

@ -1,6 +1,7 @@
import * as Docker from 'dockerode'; import * as Docker from 'dockerode';
import assign = require('lodash/assign'); import assign = require('lodash/assign');
import isEqual = require('lodash/isEqual'); import isEqual = require('lodash/isEqual');
import omitBy = require('lodash/omitBy');
import constants = require('../lib/constants'); import constants = require('../lib/constants');
import { InternalInconsistencyError } from '../lib/errors'; import { InternalInconsistencyError } from '../lib/errors';
@ -90,7 +91,10 @@ export class Volume {
public isEqualConfig(volume: Volume): boolean { public isEqualConfig(volume: Volume): boolean {
return ( return (
isEqual(this.config.driverOpts, volume.config.driverOpts) && isEqual(this.config.driverOpts, volume.config.driverOpts) &&
isEqual(this.config.labels, volume.config.labels) isEqual(
Volume.omitSupervisorLabels(this.config.labels),
Volume.omitSupervisorLabels(volume.config.labels),
)
); );
} }
@ -148,6 +152,14 @@ export class Volume {
name: match[2], name: match[2],
}; };
} }
private static omitSupervisorLabels(labels: LabelObject): LabelObject {
// TODO: Export these to a constant
return omitBy(
labels,
(_v, k) => k === 'io.resin.supervised' || k === 'io.balena.supervised',
);
}
} }
export default Volume; export default Volume;