diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-23 10:00:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 10:00:21 +0200 |
| commit | 9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0 (patch) | |
| tree | 374e31027ef0f48891cbac1abfc19637cd57bb99 /pkg/specgen | |
| parent | 22a7d60f18a60bda02b40b5f2489014ba5f1c651 (diff) | |
| parent | f61a7f25a8a6ec27fec069989f4b19b2ea19fc75 (diff) | |
| download | podman-9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0.tar.gz podman-9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0.tar.bz2 podman-9e37fd43e47d32d5bfbc920c6d7aedfad5662ae0.zip | |
Merge pull request #6625 from QiWang19/fd
Add --preservefds to podman run
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/container_create.go | 4 | ||||
| -rw-r--r-- | pkg/specgen/specgen.go | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go index 2f7100e7e..ea6f938a8 100644 --- a/pkg/specgen/generate/container_create.go +++ b/pkg/specgen/generate/container_create.go @@ -104,6 +104,10 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener return nil, err } + if s.PreserveFDs > 0 { + options = append(options, libpod.WithPreserveFDs(s.PreserveFDs)) + } + opts, err := createContainerOptions(ctx, rt, s, pod, finalVolumes, newImage) if err != nil { return nil, err diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index 77b1353c4..46ff8c716 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -130,6 +130,11 @@ type ContainerBasicConfig struct { // Remove indicates if the container should be removed once it has been started // and exits Remove bool `json:"remove"` + // PreserveFDs is a number of additional file descriptors (in addition + // to 0, 1, 2) that will be passed to the executed process. The total FDs + // passed will be 3 + PreserveFDs. + // set tags as `json:"-"` for not supported remote + PreserveFDs uint `json:"-"` } // ContainerStorageConfig contains information on the storage configuration of a |