toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test and fix external secrets in stack deploy.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin
2017-01-18 13:06:36 -05:00
parent 4a1c23bc26
commit 682d75fa3f
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compose/convert/service.go
View File

@ -31,7 +31,7 @@ func Services(
for _, service := range services {
secrets, err := convertServiceSecrets(client, namespace, service.Secrets)
secrets, err := convertServiceSecrets(client, namespace, service.Secrets, config.Secrets)
if err != nil {
return nil, err
}
@ -181,6 +181,7 @@ func convertServiceSecrets(
client client.SecretAPIClient,
namespace Namespace,
secrets []composetypes.ServiceSecretConfig,
secretSpecs map[string]composetypes.SecretConfig,
) ([]*swarm.SecretReference, error) {
opts := []*types.SecretRequestOption{}
for _, secret := range secrets {
@ -188,8 +189,15 @@ func convertServiceSecrets(
if target == "" {
target = secret.Source
}
source := namespace.Scope(secret.Source)
secretSpec := secretSpecs[secret.Source]
if secretSpec.External.External {
source = secretSpec.External.Name
}
opts = append(opts, &types.SecretRequestOption{
Source: namespace.Scope(secret.Source),
Source: source,
Target: target,
UID: secret.UID,
GID: secret.GID,