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 /cmd/podman | |
| 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 'cmd/podman')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index b03846bbc..b533dc056 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -78,8 +78,6 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber bool, options = append(options, libpod.WithRenumber()) } - options = append(options, libpod.WithContext(ctx)) - // Only set this if the user changes storage config on the command line if storageSet { options = append(options, libpod.WithStorageConfig(storageOpts)) @@ -146,7 +144,7 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber bool, options = append(options, libpod.WithDefaultInfraCommand(infraCommand)) } if c.Flags().Changed("config") { - return libpod.NewRuntimeFromConfig(c.GlobalFlags.Config, options...) + return libpod.NewRuntimeFromConfig(ctx, c.GlobalFlags.Config, options...) } - return libpod.NewRuntime(options...) + return libpod.NewRuntime(ctx, options...) } |