diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-18 06:15:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 06:15:52 -0400 |
| commit | 4b037d2acccd0de8a09fff91be6c266739e68694 (patch) | |
| tree | 19a67ecf9e67fd6ff5cef93a498eefd54f71f24f /libpod | |
| parent | 6c628b05571ee7618b6e985cfa804303a29c9dd8 (diff) | |
| parent | 5f6fff0899ef3962af8ad41e6dc3c564520557dd (diff) | |
| download | podman-4b037d2acccd0de8a09fff91be6c266739e68694.tar.gz podman-4b037d2acccd0de8a09fff91be6c266739e68694.tar.bz2 podman-4b037d2acccd0de8a09fff91be6c266739e68694.zip | |
Merge pull request #7675 from zhangguanzhang/set-process-path-and-arg-with-infra-command
fix the .Path and .Args when use the infra-command
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 164068638..570cdd38f 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -50,7 +50,11 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawIm entryPoint = config.Entrypoint entryCmd = config.Entrypoint } + } else { // so use the InfraCommand + entrypointSet = true + entryCmd = entryPoint } + if len(config.Cmd) > 0 { // We can't use the default pause command, since we're // sourcing from the image. If we didn't already set an |