Blame SOURCES/podman-1846364.patch
|
 |
628da5 |
From a81891bb376d673cb6bef851b522a6d678e15ed0 Mon Sep 17 00:00:00 2001
|
|
|
628da5 |
From: Daniel J Walsh <dwalsh@redhat.com>
|
|
|
628da5 |
Date: Wed, 24 Jun 2020 10:34:25 -0400
|
|
|
628da5 |
Subject: [PATCH] Allow security-opts to be parsed even if container is
|
|
|
628da5 |
--privileged
|
|
|
628da5 |
|
|
|
628da5 |
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
|
|
|
628da5 |
---
|
|
|
628da5 |
cmd/podman/shared/create.go | 7 +++----
|
|
|
628da5 |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
628da5 |
|
|
|
628da5 |
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
|
|
|
628da5 |
index dc343e6942..11a0c9cbe8 100644
|
|
|
628da5 |
--- a/cmd/podman/shared/create.go
|
|
|
628da5 |
+++ b/cmd/podman/shared/create.go
|
|
|
628da5 |
@@ -796,10 +796,9 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod.
|
|
|
628da5 |
|
|
|
628da5 |
if config.Privileged {
|
|
|
628da5 |
config.LabelOpts = label.DisableSecOpt()
|
|
|
628da5 |
- } else {
|
|
|
628da5 |
- if err := parseSecurityOpt(config, c.StringArray("security-opt"), runtime); err != nil {
|
|
|
628da5 |
- return nil, err
|
|
|
628da5 |
- }
|
|
|
628da5 |
+ }
|
|
|
628da5 |
+ if err := parseSecurityOpt(config, c.StringArray("security-opt"), runtime); err != nil {
|
|
|
628da5 |
+ return nil, err
|
|
|
628da5 |
}
|
|
|
628da5 |
config.SecurityOpts = c.StringArray("security-opt")
|
|
|
628da5 |
warnings, err := verifyContainerResources(config, false)
|