summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-05-09 05:11:18 -0400
committerGitHub <noreply@github.com>2020-05-09 05:11:18 -0400
commite81f8008a346807ad68bea95bad585b53dc7b985 (patch)
tree1848df4cfafbc5edae42bb77ec38bc8eb4016764 /cmd
parent5c7ac1ba7812a99e59251cf49f7fb2a9c2429e11 (diff)
parent26f48139cea99c24222367a576f56dcd7329943d (diff)
downloadpodman-e81f8008a346807ad68bea95bad585b53dc7b985.tar.gz
podman-e81f8008a346807ad68bea95bad585b53dc7b985.tar.bz2
podman-e81f8008a346807ad68bea95bad585b53dc7b985.zip
Merge pull request #6147 from mheon/fix_inspect_annotations
Add remaining annotations for `podman inspect`
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common/specgen.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index ff7c39de2..664e66df8 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -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