diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-17 21:08:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 21:08:32 +0200 |
| commit | 8caed305741c8c9e34ec767c9054e3c5e0d33576 (patch) | |
| tree | a52d68931d6f620ff66ac31b7ca6629b420f7b06 /libpod/runtime_pod_infra_linux.go | |
| parent | 47108e2e093bae318773998a18f83d0504a402e0 (diff) | |
| parent | c4b2078508a45843034a86916b37a52d3e34d20d (diff) | |
| download | podman-8caed305741c8c9e34ec767c9054e3c5e0d33576.tar.gz podman-8caed305741c8c9e34ec767c9054e3c5e0d33576.tar.bz2 podman-8caed305741c8c9e34ec767c9054e3c5e0d33576.zip | |
Merge pull request #7283 from mheon/pod_infra_has_exit_cmd
Ensure pod infra containers have an exit command
Diffstat (limited to 'libpod/runtime_pod_infra_linux.go')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 4d149a6eb..b2f21d946 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -83,6 +83,9 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawIm return nil, errors.Wrapf(err, "error removing network namespace from pod %s infra container", p.ID()) } + // For each option in InfraContainerConfig - if set, pass into + // the infra container we're creating with the appropriate + // With... option. if p.config.InfraContainer.StaticIP != nil { options = append(options, WithStaticIP(p.config.InfraContainer.StaticIP)) } @@ -107,6 +110,9 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawIm if len(p.config.InfraContainer.HostAdd) > 0 { options = append(options, WithHosts(p.config.InfraContainer.HostAdd)) } + if len(p.config.InfraContainer.ExitCommand) > 0 { + options = append(options, WithExitCommand(p.config.InfraContainer.ExitCommand)) + } } g.SetRootReadonly(true) |