opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16273 from vrothberg/cidfile

Browse Source 
container/pod id file: truncate instead of throwing an error
This commit is contained in:
OpenShift Merge Robot
2022-10-25 07:32:55 -04:00
committed by GitHub
parent 9a44cfcfa6 221cfc6872
commit 86f7b99924
11 changed files with 20 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/domain/infra/abi/containers.go
View File

@ -1120,7 +1120,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
}
if opts.CIDFile != "" {
if err := util.CreateCidFile(opts.CIDFile, ctr.ID()); err != nil {
if err := util.CreateIDFile(opts.CIDFile, ctr.ID()); err != nil {
// If you fail to create CIDFile then remove the container
_ = removeContainer(ctr, true)
return nil, err

2
pkg/domain/infra/tunnel/containers.go
View File

@ -804,7 +804,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
}
if opts.CIDFile != "" {
if err := util.CreateCidFile(opts.CIDFile, con.ID); err != nil {
if err := util.CreateIDFile(opts.CIDFile, con.ID); err != nil {
// If you fail to create CIDFile then remove the container
_ = removeContainer(con.ID, true)
return nil, err