diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-04-30 08:40:01 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-05-01 15:00:26 -0400 |
| commit | 4a2765c4989df88681c18333c1ae45017e09613a (patch) | |
| tree | bcdabbece6bb22b63e8c74daf1f9b191b1820c05 /pkg/specgen/generate/oci.go | |
| parent | 730fbc76284fd14749863ee160e6548577e7b180 (diff) | |
| download | podman-4a2765c4989df88681c18333c1ae45017e09613a.tar.gz podman-4a2765c4989df88681c18333c1ae45017e09613a.tar.bz2 podman-4a2765c4989df88681c18333c1ae45017e09613a.zip | |
Properly handle default capabilities listed in containers.conf
If user/admin specifies a different list of default capabilties
we need to honor these.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index c70141109..8136c0993 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -304,7 +304,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt } configSpec := g.Config - if err := securityConfigureGenerator(s, &g, newImage); err != nil { + if err := securityConfigureGenerator(s, &g, newImage, rtc); err != nil { return nil, err } |