diff options
| author | zhangguanzhang <guanzhangzhang@gmail.com> | 2020-06-12 19:54:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 19:54:10 +0800 |
| commit | 64eae15aa7905dd49f4a348f6b4765dfb4d9dd91 (patch) | |
| tree | 2914c20a2e0e15383da50334cad89b9b85b209a1 /pkg/spec/createconfig.go | |
| parent | 3218736cff4b718b8fe855759687cb66f19d6e1e (diff) | |
| parent | 8aa5cf3d45998bc92eaafd67ab2a59e3722bade4 (diff) | |
| download | podman-64eae15aa7905dd49f4a348f6b4765dfb4d9dd91.tar.gz podman-64eae15aa7905dd49f4a348f6b4765dfb4d9dd91.tar.bz2 podman-64eae15aa7905dd49f4a348f6b4765dfb4d9dd91.zip | |
Merge pull request #1 from containers/master
# sync
Diffstat (limited to 'pkg/spec/createconfig.go')
| -rw-r--r-- | pkg/spec/createconfig.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go index 2cf30a59e..e19c582b5 100644 --- a/pkg/spec/createconfig.go +++ b/pkg/spec/createconfig.go @@ -399,7 +399,7 @@ func AddPrivilegedDevices(g *generate.Generator) error { return addPrivilegedDevices(g) } -func CreateContainerFromCreateConfig(r *libpod.Runtime, createConfig *CreateConfig, ctx context.Context, pod *libpod.Pod) (*libpod.Container, error) { +func CreateContainerFromCreateConfig(ctx context.Context, r *libpod.Runtime, createConfig *CreateConfig, pod *libpod.Pod) (*libpod.Container, error) { runtimeSpec, options, err := createConfig.MakeContainerConfig(r, pod) if err != nil { return nil, err |