summaryrefslogtreecommitdiff
path: root/cmd/podman/common/specgen.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-20 17:19:32 -0400
committerGitHub <noreply@github.com>2020-04-20 17:19:32 -0400
commitb7714672247e2674303c46fa93b12cbf047b0204 (patch)
treec4615354a29a9d0cf744c3c833e0878e4fe04dfb /cmd/podman/common/specgen.go
parent1e9b3e7500a14ae066f5790fad6c3dfa9f94b688 (diff)
parentb35a0d0cd2bad55e7d1a7c8d77322d2ff3f43600 (diff)
downloadpodman-b7714672247e2674303c46fa93b12cbf047b0204.tar.gz
podman-b7714672247e2674303c46fa93b12cbf047b0204.tar.bz2
podman-b7714672247e2674303c46fa93b12cbf047b0204.zip
Merge pull request #5862 from rhatdan/v2
Fix up handling of image data as well as setting Linux Capabilties correctly
Diffstat (limited to 'cmd/podman/common/specgen.go')
-rw-r--r--cmd/podman/common/specgen.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index b8526993c..7550bf784 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -424,6 +424,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
}
}
+ s.SeccompPolicy = c.SeccompPolicy
// TODO any idea why this was done
// storage.go from spec/
// grab it