ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-04-25 05:19:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #758 from resin-io/fix-storage-opt

Browse Source 
fix: Remove support for broken storageOpt option
This commit is contained in:
CameronDiver 2018-10-16 10:20:27 +01:00 committed by GitHub
commit 11e97702cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compose/service.ts
View File

@ -60,7 +60,6 @@ export class Service {
// This field is passed at container creation, but is not // This field is passed at container creation, but is not
// reported on a container inspect, so we cannot use it // reported on a container inspect, so we cannot use it
// to compare containers // to compare containers
'storageOpt',
'cpus', 'cpus',
].concat(Service.configArrayFields); ].concat(Service.configArrayFields);
@ -321,7 +320,6 @@ export class Service {
securityOpt: [ ], securityOpt: [ ],
stopGracePeriod, stopGracePeriod,
stopSignal: '', stopSignal: '',
storageOpt: { },
sysctls: { }, sysctls: { },
tmpfs, tmpfs,
usernsMode: '', usernsMode: '',
@ -464,9 +462,6 @@ export class Service {
pid: container.HostConfig.PidMode || '', pid: container.HostConfig.PidMode || '',
pidsLimit: container.HostConfig.PidsLimit || 0, pidsLimit: container.HostConfig.PidsLimit || 0,
securityOpt: container.HostConfig.SecurityOpt || [ ], securityOpt: container.HostConfig.SecurityOpt || [ ],
// StorageOpt is present on container creation, but not
// when you inspect the container
storageOpt: { },
usernsMode: container.HostConfig.UsernsMode || '', usernsMode: container.HostConfig.UsernsMode || '',
ipc: container.HostConfig.IpcMode || '', ipc: container.HostConfig.IpcMode || '',
macAddress: (container.Config as any).MacAddress || '', macAddress: (container.Config as any).MacAddress || '',
@ -552,7 +547,6 @@ export class Service {
ReadonlyRootfs: this.config.readOnly, ReadonlyRootfs: this.config.readOnly,
ShmSize: this.config.shmSize, ShmSize: this.config.shmSize,
Tmpfs: tmpFs, Tmpfs: tmpFs,
StorageOpt: this.config.storageOpt,
UsernsMode: this.config.usernsMode, UsernsMode: this.config.usernsMode,
NanoCpus: this.config.cpus, NanoCpus: this.config.cpus,
IpcMode: this.config.ipc, IpcMode: this.config.ipc,

2
src/compose/types/service.ts
View File

@ -61,7 +61,6 @@ export interface ServiceComposeConfig {
securityOpt?: string[]; securityOpt?: string[];
stopGracePeriod?: string; stopGracePeriod?: string;
stopSignal?: string; stopSignal?: string;
storageOpt?: { [opt: string]: string };
sysctls?: { [name: string]: string }; sysctls?: { [name: string]: string };
ulimits?: { ulimits?: {
[ulimitName: string]: number | { soft: number, hard: number }; [ulimitName: string]: number | { soft: number, hard: number };
@ -126,7 +125,6 @@ export interface ServiceConfig {
securityOpt: string[]; securityOpt: string[];
stopGracePeriod: number; stopGracePeriod: number;
stopSignal: string; stopSignal: string;
storageOpt: { [opt: string]: string };
sysctls: { [name: string]: string }; sysctls: { [name: string]: string };
ulimits: { ulimits: {
[ulimitName: string]: { soft: number, hard: number }; [ulimitName: string]: { soft: number, hard: number };