containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6227 from adrianreber/typo 

Fix checkpoint --leave-running
This commit is contained in:
OpenShift Merge Robot 2020-05-15 06:23:32 -07:00 committed by GitHub
parent 4611ff5ce4 7c7f4dbb51
commit a88cd9a22e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/containers/checkpoint.go
View File

@ -45,7 +45,7 @@ func init() {
}) })
flags := checkpointCommand.Flags() flags := checkpointCommand.Flags()
flags.BoolVarP(&checkpointOptions.Keep, "keep", "k", false, "Keep all temporary checkpoint files") flags.BoolVarP(&checkpointOptions.Keep, "keep", "k", false, "Keep all temporary checkpoint files")
flags.BoolVarP(&checkpointOptions.LeaveRuninng, "leave-running", "R", false, "Leave the container running after writing checkpoint to disk") flags.BoolVarP(&checkpointOptions.LeaveRunning, "leave-running", "R", false, "Leave the container running after writing checkpoint to disk")
flags.BoolVar(&checkpointOptions.TCPEstablished, "tcp-established", false, "Checkpoint a container with established TCP connections") flags.BoolVar(&checkpointOptions.TCPEstablished, "tcp-established", false, "Checkpoint a container with established TCP connections")
flags.BoolVarP(&checkpointOptions.All, "all", "a", false, "Checkpoint all running containers") flags.BoolVarP(&checkpointOptions.All, "all", "a", false, "Checkpoint all running containers")
flags.BoolVarP(&checkpointOptions.Latest, "latest", "l", false, "Act on the latest container podman is aware of") flags.BoolVarP(&checkpointOptions.Latest, "latest", "l", false, "Act on the latest container podman is aware of")

2
pkg/domain/entities/containers.go
View File

@ -170,7 +170,7 @@ type CheckpointOptions struct {
IgnoreRootFS bool IgnoreRootFS bool
Keep bool Keep bool
Latest bool Latest bool
LeaveRuninng bool LeaveRunning bool
TCPEstablished bool TCPEstablished bool
} }

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

@ -434,6 +434,7 @@ func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds [
TCPEstablished: options.TCPEstablished, TCPEstablished: options.TCPEstablished,
TargetFile: options.Export, TargetFile: options.Export,
IgnoreRootfs: options.IgnoreRootFS, IgnoreRootfs: options.IgnoreRootFS,
KeepRunning: options.LeaveRunning,
} }
if options.All { if options.All {

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

@ -267,7 +267,7 @@ func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds [
} }
} }
for _, c := range ctrs { for _, c := range ctrs {
report, err := containers.Checkpoint(ic.ClientCxt, c.ID, &options.Keep, &options.LeaveRuninng, &options.TCPEstablished, &options.IgnoreRootFS, &options.Export) report, err := containers.Checkpoint(ic.ClientCxt, c.ID, &options.Keep, &options.LeaveRunning, &options.TCPEstablished, &options.IgnoreRootFS, &options.Export)
if err != nil { if err != nil {
reports = append(reports, &entities.CheckpointReport{Id: c.ID, Err: err}) reports = append(reports, &entities.CheckpointReport{Id: c.ID, Err: err})
} }