Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28306 from ehazlett/service-create-no-secrets 

only check secrets for service create if requested
This commit is contained in:
Vincent Demeester 2016-11-11 20:58:40 +01:00 committed by GitHub
parent 460a7e213c 885c5f1747
commit 827b121154
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/service/create.go
View File

@ -62,13 +62,17 @@ func runCreate(dockerCli *command.DockerCli, opts *serviceOptions) error {
return err return err
} }
specifiedSecrets := opts.secrets.Value()
if len(specifiedSecrets) > 0 {
// parse and validate secrets // parse and validate secrets
secrets, err := parseSecrets(apiClient, opts.secrets.Value()) secrets, err := parseSecrets(apiClient, specifiedSecrets)
if err != nil { if err != nil {
return err return err
} }
service.TaskTemplate.ContainerSpec.Secrets = secrets service.TaskTemplate.ContainerSpec.Secrets = secrets
}
ctx := context.Background() ctx := context.Background()
// only send auth if flag was set // only send auth if flag was set