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

Merge pull request #163 from vdemeester/export-convertservice 

Update ConvertService for external usage 👼
This commit is contained in:
Vincent Demeester 2017-06-08 10:55:56 +02:00 committed by GitHub
parent 08cb0bddfd 96dc07a8cf
commit c944d20b1f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/compose/convert/service.go
View File

@ -41,7 +41,7 @@ func Services(
return nil, errors.Wrapf(err, "service %s", service.Name) return nil, errors.Wrapf(err, "service %s", service.Name)
} }
serviceSpec, err := convertService(client.ClientVersion(), namespace, service, networks, volumes, secrets, configs) serviceSpec, err := Service(client.ClientVersion(), namespace, service, networks, volumes, secrets, configs)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "service %s", service.Name) return nil, errors.Wrapf(err, "service %s", service.Name)
} }
@ -51,7 +51,8 @@ func Services(
return result, nil return result, nil
} }
func convertService( // Service converts a ServiceConfig into a swarm ServiceSpec
func Service(
apiVersion string, apiVersion string,
namespace Namespace, namespace Namespace,
service composetypes.ServiceConfig, service composetypes.ServiceConfig,