summaryrefslogtreecommitdiff
path: root/cmd/podman/common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-24 14:57:35 -0400
committerGitHub <noreply@github.com>2020-06-24 14:57:35 -0400
commit2df3faab7b2801cc2e3c2291b618ae530223329d (patch)
tree7649c3e76eb41cc4e832b628b55d2df68678d05e /cmd/podman/common
parent4ee66598c1201a7d191c03c2d2f067f847aaddf5 (diff)
parent7330647cbd752274bd0b1826a24b68efd1cf5c1c (diff)
downloadpodman-2df3faab7b2801cc2e3c2291b618ae530223329d.tar.gz
podman-2df3faab7b2801cc2e3c2291b618ae530223329d.tar.bz2
podman-2df3faab7b2801cc2e3c2291b618ae530223329d.zip
Merge pull request #6752 from rhatdan/inspect
Fix inspect to display multiple label: changes
Diffstat (limited to 'cmd/podman/common')
-rw-r--r--cmd/podman/common/specgen.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index fef059958..1f6fbbe98 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -520,7 +520,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
case "label":
// TODO selinux opts and label opts are the same thing
s.ContainerSecurityConfig.SelinuxOpts = append(s.ContainerSecurityConfig.SelinuxOpts, con[1])
- s.Annotations[define.InspectAnnotationLabel] = con[1]
+ s.Annotations[define.InspectAnnotationLabel] = strings.Join(s.ContainerSecurityConfig.SelinuxOpts, ",label=")
case "apparmor":
s.ContainerSecurityConfig.ApparmorProfile = con[1]
s.Annotations[define.InspectAnnotationApparmor] = con[1]