diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-16 07:53:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 07:53:43 -0400 |
| commit | ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805 (patch) | |
| tree | 0f16371ff56a8323db480d010b0315e600c2a50b /libpod/runtime_pod_infra_linux.go | |
| parent | 3ba9f2a205787135b4e34e4d217df3ab9d0071b8 (diff) | |
| parent | af40dfc2bf614aeb4191916cc2420068696eb776 (diff) | |
| download | podman-ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805.tar.gz podman-ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805.tar.bz2 podman-ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805.zip | |
Merge pull request #10820 from jvanz/indfra-container-name-issue-10794
--infra-name command line argument
Diffstat (limited to 'libpod/runtime_pod_infra_linux.go')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index 8342352ec..d4f861118 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -201,7 +201,11 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawIm g.AddLinuxSysctl(sysctlKey, sysctlVal) } - containerName := p.ID()[:IDTruncLength] + "-infra" + containerName := p.config.InfraContainer.InfraName + if containerName == "" { + containerName = p.ID()[:IDTruncLength] + "-infra" + } + logrus.Infof("Infra container name %s", containerName) options = append(options, r.WithPod(p)) options = append(options, WithRootFSFromImage(imgID, imgName, rawImageName)) options = append(options, WithName(containerName)) |