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/trust_set_show.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/trust_set_show.go')
| -rw-r--r-- | cmd/podman/trust_set_show.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/podman/trust_set_show.go b/cmd/podman/trust_set_show.go index cd6c4897e..626d27aae 100644 --- a/cmd/podman/trust_set_show.go +++ b/cmd/podman/trust_set_show.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/containers/buildah/pkg/formats" + "github.com/containers/image/types" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod/image" @@ -236,6 +237,10 @@ func isValidTrustType(t string) bool { return false } +func getDefaultPolicyPath() string { + return trust.DefaultPolicyPath(&types.SystemContext{}) +} + func getPolicyJSON(policyContentStruct trust.PolicyContent, systemRegistriesDirPath string) (map[string]map[string]interface{}, error) { registryConfigs, err := trust.LoadAndMergeConfig(systemRegistriesDirPath) if err != nil { |