diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 05:21:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 05:21:09 -0400 |
| commit | 47d99fb6253238e7603fc96d5b9bbb14f1e8c948 (patch) | |
| tree | 23f7e52d04fe78df60ba1a94c1ef5e7106ff8e82 /cmd/podman/pods/pod.go | |
| parent | 8884f6a4f357ea64ad5f20f791ec0a09bdd36352 (diff) | |
| parent | 532c7343a9af5fbdcc682f7f93c987b1f1e49b41 (diff) | |
| download | podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.gz podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.tar.bz2 podman-47d99fb6253238e7603fc96d5b9bbb14f1e8c948.zip | |
Merge pull request #5647 from rhatdan/containers.conf
Update podmanV2 to use containers.conf
Diffstat (limited to 'cmd/podman/pods/pod.go')
| -rw-r--r-- | cmd/podman/pods/pod.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go index 1cac50e40..fa917b2ae 100644 --- a/cmd/podman/pods/pod.go +++ b/cmd/podman/pods/pod.go @@ -3,6 +3,7 @@ package pods import ( "github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/pkg/domain/entities" + "github.com/containers/libpod/pkg/util" "github.com/spf13/cobra" ) @@ -15,6 +16,7 @@ var ( TraverseChildren: true, RunE: registry.SubCommandExists, } + containerConfig = util.DefaultContainerConfig() ) func init() { |