Only read trust setting from options

Rename IsTrusted to ContentTrustEnabled

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: feae0e9756
Component: cli
This commit is contained in:
Daniel Nephin
2018-03-08 14:56:56 -05:00
parent 5e391186a8
commit a895fe3327
13 changed files with 48 additions and 49 deletions

View File

@ -16,7 +16,7 @@ import (
)
func resolveServiceImageDigestContentTrust(dockerCli command.Cli, service *swarm.ServiceSpec) error {
if !dockerCli.IsTrusted() {
if !dockerCli.ContentTrustEnabled() {
// When not using content trust, digest resolution happens later when
// contacting the registry to retrieve image information.
return nil