Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2661 from akerouanton/fix-service-formatter 

Pretty service inspect fails when TaskTemplate.Resources is nil
This commit is contained in:
Sebastiaan van Stijn 2020-07-30 21:21:26 +02:00 committed by GitHub
parent 5c9a8e9973 21da11c5fd
commit 5f979eeac2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/command/service/formatter.go
View File

@ -502,6 +502,9 @@ func (ctx *serviceInspectContext) ResourceLimitMemory() string {
} }
func (ctx *serviceInspectContext) ResourceLimitPids() int64 { func (ctx *serviceInspectContext) ResourceLimitPids() int64 {
if ctx.Service.Spec.TaskTemplate.Resources == nil || ctx.Service.Spec.TaskTemplate.Resources.Limits == nil {
return 0
}
return ctx.Service.Spec.TaskTemplate.Resources.Limits.Pids return ctx.Service.Spec.TaskTemplate.Resources.Limits.Pids
} }