diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-18 19:48:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 19:48:16 +0100 |
| commit | 0376e6092c850435b4740876045fdccb467cafd8 (patch) | |
| tree | 3f218782c0726046d5e191570a2e33bddcf4bddf /pkg/domain | |
| parent | 9b964945d661d4f97b4a97f2f67d33f9dcd11e50 (diff) | |
| parent | fceecc3a5bb48280fb40f7547156fda44e313421 (diff) | |
| download | podman-0376e6092c850435b4740876045fdccb467cafd8.tar.gz podman-0376e6092c850435b4740876045fdccb467cafd8.tar.bz2 podman-0376e6092c850435b4740876045fdccb467cafd8.zip | |
Merge pull request #12342 from vrothberg/fix-12334
remote checkpoint/restore: more fixes
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 152e3c302..a7dcc923b 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -308,7 +308,9 @@ func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds [ options.WithExport(opts.Export) options.WithTCPEstablished(opts.TCPEstablished) options.WithPrintStats(opts.PrintStats) + options.WithPreCheckpoint(opts.PreCheckPoint) options.WithLeaveRunning(opts.LeaveRunning) + options.WithWithPrevious(opts.WithPrevious) var ( err error @@ -345,6 +347,10 @@ func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds [ } func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []string, opts entities.RestoreOptions) ([]*entities.RestoreReport, error) { + if opts.ImportPrevious != "" { + return nil, fmt.Errorf("--import-previous is not supported on the remote client") + } + options := new(containers.RestoreOptions) options.WithIgnoreRootfs(opts.IgnoreRootFS) options.WithIgnoreVolumes(opts.IgnoreVolumes) |