summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/tunnel
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-10-23 06:58:41 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-10-26 05:53:26 -0400
commit32af1be01a37362d81baff47a2bb28e4c863a8c9 (patch)
treecd61e6e4bb016b4c73da7819343fb983cee3c730 /pkg/domain/infra/tunnel
parent8f498b52de43b20d5f9aa83c3a27e0464d41bdee (diff)
downloadpodman-32af1be01a37362d81baff47a2bb28e4c863a8c9.tar.gz
podman-32af1be01a37362d81baff47a2bb28e4c863a8c9.tar.bz2
podman-32af1be01a37362d81baff47a2bb28e4c863a8c9.zip
The cidfile should be created when the container is created
Currently if you run an interactive session of podman run and specifiy the --cidfile option, the cidfile will not get created until the container finishes running. If you run a detached container, it will get created right away. This Patch creates the cidfile as soon as the container is created. This could allow other tools to use the cidefile on all running containers. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/domain/infra/tunnel')
-rw-r--r--pkg/domain/infra/tunnel/containers.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 7913d79cd..8066e1c00 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -21,6 +21,7 @@ import (
"github.com/containers/podman/v2/pkg/domain/entities"
"github.com/containers/podman/v2/pkg/errorhandling"
"github.com/containers/podman/v2/pkg/specgen"
+ "github.com/containers/podman/v2/pkg/util"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -558,6 +559,11 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
for _, w := range con.Warnings {
fmt.Fprintf(os.Stderr, "%s\n", w)
}
+ if opts.CIDFile != "" {
+ if err := util.CreateCidFile(opts.CIDFile, con.ID); err != nil {
+ return nil, err
+ }
+ }
report := entities.ContainerRunReport{Id: con.ID}