opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6147 from mheon/fix_inspect_annotations

Browse Source 
Add remaining annotations for `podman inspect`
This commit is contained in:
Daniel J Walsh
2020-05-09 05:11:18 -04:00
committed by GitHub
parent 5c7ac1ba78 26f48139ce
commit e81f8008a3
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/common/specgen.go
View File

@ -519,6 +519,10 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
}
s.Sysctl = sysmap
if c.CIDFile != "" {
s.Annotations[define.InspectAnnotationCIDFile] = c.CIDFile
}
for _, opt := range c.SecurityOpt {
if opt == "no-new-privileges" {
s.ContainerSecurityConfig.NoNewPrivileges = true

18
pkg/specgen/generate/oci.go
View File

@ -321,12 +321,6 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
configSpec.Annotations = make(map[string]string)
}
// TODO cidfile is not in specgen; when wiring up cli, we will need to move this out of here
// leaving as a reminder
//if config.CidFile != "" {
// configSpec.Annotations[libpod.InspectAnnotationCIDFile] = config.CidFile
//}
if s.Remove {
configSpec.Annotations[define.InspectAnnotationAutoremove] = define.InspectResponseTrue
} else {
@ -343,13 +337,11 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
configSpec.Annotations[define.InspectAnnotationPrivileged] = define.InspectResponseFalse
}
// TODO Init might not make it into the specgen and therefore is not available here. We should deal
// with this when we wire up the CLI; leaving as a reminder
//if s.Init {
// configSpec.Annotations[libpod.InspectAnnotationInit] = libpod.InspectResponseTrue
//} else {
// configSpec.Annotations[libpod.InspectAnnotationInit] = libpod.InspectResponseFalse
//}
if s.Init {
configSpec.Annotations[define.InspectAnnotationInit] = define.InspectResponseTrue
} else {
configSpec.Annotations[define.InspectAnnotationInit] = define.InspectResponseFalse
}
return configSpec, nil
}