diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-13 21:11:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-13 21:11:21 +0200 |
commit | 9ede14e1cd3d3fa6cac0dbb0a7286a8fc0118376 (patch) | |
tree | e9d934d7ac27a2792008128f0c8acbd412818225 /pkg/spec | |
parent | 90831dfdced0f52867c47cac75b5ea09e0e916c2 (diff) | |
parent | feff414ae1d4ca68b3341fa37c4abf8fc90a55f8 (diff) | |
download | podman-9ede14e1cd3d3fa6cac0dbb0a7286a8fc0118376.tar.gz podman-9ede14e1cd3d3fa6cac0dbb0a7286a8fc0118376.tar.bz2 podman-9ede14e1cd3d3fa6cac0dbb0a7286a8fc0118376.zip |
Merge pull request #7227 from giuseppe/procfs-opts
run, create: add new security-opt proc-opts
Diffstat (limited to 'pkg/spec')
-rw-r--r-- | pkg/spec/createconfig.go | 1 | ||||
-rw-r--r-- | pkg/spec/security.go | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 40f9bc029..c49d51fc5 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -125,6 +125,7 @@ type SecurityConfig struct { ReadOnlyRootfs bool //read-only ReadOnlyTmpfs bool //read-only-tmpfs Sysctl map[string]string //sysctl + ProcOpts []string } // CreateConfig is a pre OCI spec structure. It represents user input from varlink or the CLI diff --git a/pkg/spec/security.go b/pkg/spec/security.go index fc908b49d..e152e3495 100644 --- a/pkg/spec/security.go +++ b/pkg/spec/security.go @@ -76,6 +76,8 @@ func (c *SecurityConfig) SetSecurityOpts(runtime *libpod.Runtime, securityOpts [ } switch con[0] { + case "proc-opts": + c.ProcOpts = strings.Split(con[1], ",") case "label": c.LabelOpts = append(c.LabelOpts, con[1]) case "apparmor": |