diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-23 07:31:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 07:31:11 -0800 |
| commit | 8beeb067aac857deb29e91562cf4b6f068fe0328 (patch) | |
| tree | f7fa07bebe0026744f233935394486f78b888401 /cmd/podman/shared | |
| parent | 6518421f89e2e953f918d35e44d3d8d7299e06a8 (diff) | |
| parent | 1531509542194bf7800621b4b7a6071f53961dab (diff) | |
| download | podman-8beeb067aac857deb29e91562cf4b6f068fe0328.tar.gz podman-8beeb067aac857deb29e91562cf4b6f068fe0328.tar.bz2 podman-8beeb067aac857deb29e91562cf4b6f068fe0328.zip | |
Merge pull request #4948 from vrothberg/seccomp-label
seccomp policy: expect profile in config label
Diffstat (limited to 'cmd/podman/shared')
| -rw-r--r-- | cmd/podman/shared/create.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 15d6bddbb..2f637694b 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -31,9 +31,9 @@ import ( "github.com/sirupsen/logrus" ) -// seccompAnnotationKey is the key of the image annotation embedding a seccomp +// seccompLabelKey is the key of the image annotation embedding a seccomp // profile. -const seccompAnnotationKey = "io.containers.seccomp.profile" +const seccompLabelKey = "io.containers.seccomp.profile" func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.Runtime) (*libpod.Container, *cc.CreateConfig, error) { var ( @@ -709,7 +709,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. // SECCOMP if data != nil { - if value, exists := data.Annotations[seccompAnnotationKey]; exists { + if value, exists := labels[seccompLabelKey]; exists { secConfig.SeccompProfileFromImage = value } } |