summaryrefslogtreecommitdiff
path: root/pkg/trust
diff options
context:
space:
mode:
authorQi Wang <qiwan@redhat.com>2020-07-24 14:09:12 -0400
committerQi Wang <qiwan@redhat.com>2020-08-04 15:10:47 -0400
commit69ac054ae6a97892a2c26296b591a59a71d67ac5 (patch)
tree76cb90b5211ececeebd6ce00d3a49acdccb026a8 /pkg/trust
parentd4cf3c589d09dd395a3b63e82f5a5c198535cb46 (diff)
downloadpodman-69ac054ae6a97892a2c26296b591a59a71d67ac5.tar.gz
podman-69ac054ae6a97892a2c26296b591a59a71d67ac5.tar.bz2
podman-69ac054ae6a97892a2c26296b591a59a71d67ac5.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 Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'pkg/trust')
-rw-r--r--pkg/trust/trust.go4
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