diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-25 17:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 17:05:26 -0400 |
| commit | 6a541f6802bf1adf3c78648d4d933ea8d6652ed2 (patch) | |
| tree | 16e6250c0dd9df1edae2bf22bc75bcbee36d4583 /cmd/podman/common/specgen.go | |
| parent | 48ce67fb5630e67f17f2460b30a0f9cddc21ab8f (diff) | |
| parent | f7b16d0173a363c322b9bc0ded590d410339626f (diff) | |
| download | podman-6a541f6802bf1adf3c78648d4d933ea8d6652ed2.tar.gz podman-6a541f6802bf1adf3c78648d4d933ea8d6652ed2.tar.bz2 podman-6a541f6802bf1adf3c78648d4d933ea8d6652ed2.zip | |
Merge pull request #6780 from mheon/even_more_201_backports
Even more v2.0.1 backports
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 26d18faf0..8c3b10a7c 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] |