diff options
| author | Qi Wang <qiwan@redhat.com> | 2020-07-24 14:09:12 -0400 |
|---|---|---|
| committer | Valentin Rothberg <rothberg@redhat.com> | 2020-08-11 12:15:12 +0200 |
| commit | a53b97beb3dfd3b95b205e35872344c5fadbb7c1 (patch) | |
| tree | e6b255cceca4ceffece094fcc90bd6d1b97e11ba /pkg/trust | |
| parent | c5646acf4a06520f4fa65acdf8eebb4130c5e7d9 (diff) | |
| download | podman-a53b97beb3dfd3b95b205e35872344c5fadbb7c1.tar.gz podman-a53b97beb3dfd3b95b205e35872344c5fadbb7c1.tar.bz2 podman-a53b97beb3dfd3b95b205e35872344c5fadbb7c1.zip | |
fix bug podman sign storage path
- fix the bud podman not using specified --directory as signature storage.
- use manifest and image referce to set repo@digest.
close #6994
close #6993
Backported-by: Valentin Rothberg <rothberg@redhat.com>
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'pkg/trust')
| -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 |