diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-04-27 16:47:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 16:47:32 -0400 |
| commit | f613a2a8d5778cf088f4d18b69c86b082264a882 (patch) | |
| tree | bf07f589419a0d25d23125eaeb27f04103b49ca1 /cmd/podman/common/specgen.go | |
| parent | dbc13f3dac4fa4095ae5db86085e5711a701eb7b (diff) | |
| parent | 3538815c5b2b4c97304e3ea940cee414b0004d2f (diff) | |
| download | podman-f613a2a8d5778cf088f4d18b69c86b082264a882.tar.gz podman-f613a2a8d5778cf088f4d18b69c86b082264a882.tar.bz2 podman-f613a2a8d5778cf088f4d18b69c86b082264a882.zip | |
Merge pull request #10119 from rhatdan/timeout
Add podman run --timeout option
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 310a07a00..f889a0169 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -641,6 +641,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string } s.Remove = c.Rm s.StopTimeout = &c.StopTimeout + s.Timeout = c.Timeout s.Timezone = c.Timezone s.Umask = c.Umask s.Secrets = c.Secrets |