diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-05 02:47:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-05 02:47:44 +0200 |
| commit | 0a3f3c94f86a2539d4a0f98a782702b3809b3006 (patch) | |
| tree | 18998f9fdef422319492d90bb920898b1cc2f645 /pkg/trust/trust.go | |
| parent | ca2eccea4a2646fb140883e9399f5d15d1997c1a (diff) | |
| parent | 69ac054ae6a97892a2c26296b591a59a71d67ac5 (diff) | |
| download | podman-0a3f3c94f86a2539d4a0f98a782702b3809b3006.tar.gz podman-0a3f3c94f86a2539d4a0f98a782702b3809b3006.tar.bz2 podman-0a3f3c94f86a2539d4a0f98a782702b3809b3006.zip | |
Merge pull request #7081 from QiWang19/sigature-store
fix bug podman sign storage path
Diffstat (limited to 'pkg/trust/trust.go')
| -rw-r--r-- | pkg/trust/trust.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/trust/trust.go b/pkg/trust/trust.go index 60de099fa..2348bc410 100644 --- a/pkg/trust/trust.go +++ b/pkg/trust/trust.go @@ -12,9 +12,9 @@ import ( "strings" "github.com/containers/image/v5/types" + "github.com/ghodss/yaml" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "gopkg.in/yaml.v2" ) // PolicyContent struct for policy.json file @@ -157,7 +157,7 @@ func HaveMatchRegistry(key string, registryConfigs *RegistryConfiguration) *Regi searchKey = searchKey[:strings.LastIndex(searchKey, "/")] } } - return nil + return registryConfigs.DefaultDocker } // CreateTmpFile creates a temp file under dir and writes the content into it |