diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-02 22:48:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 22:48:12 +0200 |
| commit | 139eeb3eb3c86555d53e20a19408a6391d3e04b5 (patch) | |
| tree | 95e71b3f77b774fd67b67310ff2eff2962e40e65 /libpod/runtime_migrate.go | |
| parent | b5e5585ada50a887f439e513c5deae30c89648de (diff) | |
| parent | 416cc20c6800d9c315a689a4c425af23f89864e4 (diff) | |
| download | podman-139eeb3eb3c86555d53e20a19408a6391d3e04b5.tar.gz podman-139eeb3eb3c86555d53e20a19408a6391d3e04b5.tar.bz2 podman-139eeb3eb3c86555d53e20a19408a6391d3e04b5.zip | |
Merge pull request #3051 from mheon/podman_migrate_fixes
Small fixes for #2950
Diffstat (limited to 'libpod/runtime_migrate.go')
| -rw-r--r-- | libpod/runtime_migrate.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libpod/runtime_migrate.go b/libpod/runtime_migrate.go index a084df289..0bb8e952f 100644 --- a/libpod/runtime_migrate.go +++ b/libpod/runtime_migrate.go @@ -1,13 +1,14 @@ package libpod import ( + "context" "path/filepath" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) -func (r *Runtime) migrate() error { +func (r *Runtime) migrate(ctx context.Context) error { runningContainers, err := r.GetRunningContainers() if err != nil { return err @@ -38,7 +39,7 @@ func (r *Runtime) migrate() error { } for _, ctr := range runningContainers { - if err := ctr.Start(r.ctx, true); err != nil { + if err := ctr.Start(ctx, true); err != nil { logrus.Errorf("error restarting container %s", ctr.ID()) } } |