diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-08 02:02:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 02:02:30 -0700 |
| commit | d86729e743fb5a58b9364ee5e991b5db2e9dd600 (patch) | |
| tree | 8ae6789a7e7e5e52de2270bb3854f01dc55b9949 /cmd/podman/common.go | |
| parent | bc320be00bc584bd88525266d23a9d5edb9d44f8 (diff) | |
| parent | 23602de816b9ee3e92a8cbac295e955ba43fa283 (diff) | |
| download | podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.tar.gz podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.tar.bz2 podman-d86729e743fb5a58b9364ee5e991b5db2e9dd600.zip | |
Merge pull request #2865 from baude/pr/2864
Revert "Switch to golangci-lint"
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index f4d128df2..10fed053e 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -10,13 +10,17 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/rootless" + "github.com/containers/storage" "github.com/fatih/camelcase" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/spf13/cobra" ) -var json = jsoniter.ConfigCompatibleWithStandardLibrary +var ( + stores = make(map[storage.Store]struct{}) + json = jsoniter.ConfigCompatibleWithStandardLibrary +) const ( idTruncLength = 12 |