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

Merge pull request #822 from balena-io/issue-821

Browse Source 
compose: Change default stop signal from '' to SIGTERM
This commit is contained in:
Shaun Mulligan
2018-11-27 12:38:50 -08:00
committed by GitHub
parent 27efe86bae aface89fd2
commit 6e05f1288e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compose/service.ts
View File

@ -349,7 +349,7 @@ export class Service {
pidsLimit: 0, pidsLimit: 0,
securityOpt: [], securityOpt: [],
stopGracePeriod, stopGracePeriod,
stopSignal: '', stopSignal: 'SIGTERM',
sysctls: {}, sysctls: {},
tmpfs, tmpfs,
usernsMode: '', usernsMode: '',
@ -492,7 +492,7 @@ export class Service {
tmpfs, tmpfs,
extraHosts: container.HostConfig.ExtraHosts || [], extraHosts: container.HostConfig.ExtraHosts || [],
ulimits, ulimits,
stopSignal: (container.Config as any).StopSignal || '', stopSignal: (container.Config as any).StopSignal || 'SIGTERM',
stopGracePeriod: (container.Config as any).StopTimeout || 10, stopGracePeriod: (container.Config as any).StopTimeout || 10,
healthcheck: ComposeUtils.dockerHealthcheckToServiceHealthcheck( healthcheck: ComposeUtils.dockerHealthcheckToServiceHealthcheck(
(container.Config as any).Healthcheck || {}, (container.Config as any).Healthcheck || {},

2
src/compose/utils.ts
View File

@ -159,7 +159,7 @@ export function getStopSignal(
} }
return composeStop; return composeStop;
} }
return _.get(imageInfo, 'Config.StopSignal', ''); return _.get(imageInfo, 'Config.StopSignal', 'SIGTERM');
} }
// TODO: Move healthcheck stuff into seperate module // TODO: Move healthcheck stuff into seperate module