kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Update ServiceInspectWithRaw

Browse source 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2016-06-17 00:47:22 +02:00
parent 2c82337b04
commit 4a70cb5571
No known key found for this signature in database
GPG key ID: 083CC6FD6EB699A3
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/client/idresolver/idresolver.go
View file

@ -40,7 +40,7 @@ func (r *IDResolver) get(ctx context.Context, t interface{}, id string) (string,
} }
return id, nil return id, nil
case swarm.Service: case swarm.Service:
service, err := r.client.ServiceInspect(ctx, id) service, _, err := r.client.ServiceInspectWithRaw(ctx, id)
if err != nil { if err != nil {
return id, nil return id, nil
} }

2
api/client/service/inspect.go
View file

@ -50,7 +50,7 @@ func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
ctx := context.Background() ctx := context.Background()
getRef := func(ref string) (interface{}, []byte, error) { getRef := func(ref string) (interface{}, []byte, error) {
service, err := client.ServiceInspect(ctx, ref) service, _, err := client.ServiceInspectWithRaw(ctx, ref)
if err == nil || !apiclient.IsErrServiceNotFound(err) { if err == nil || !apiclient.IsErrServiceNotFound(err) {
return service, nil, err return service, nil, err
} }

3
api/client/service/scale.go
View file

@ -61,7 +61,8 @@ func runServiceScale(dockerCli *client.DockerCli, serviceID string, scale string
client := dockerCli.Client() client := dockerCli.Client()
ctx := context.Background() ctx := context.Background()
service, err := client.ServiceInspect(ctx, serviceID) service, _, err := client.ServiceInspectWithRaw(ctx, serviceID)
if err != nil { if err != nil {
return err return err
} }

2
api/client/service/tasks.go
View file

@ -44,7 +44,7 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
client := dockerCli.Client() client := dockerCli.Client()
ctx := context.Background() ctx := context.Background()
service, err := client.ServiceInspect(ctx, opts.serviceID) service, _, err := client.ServiceInspectWithRaw(ctx, opts.serviceID)
if err != nil { if err != nil {
return err return err
} }

2
api/client/service/update.go
View file

@ -41,7 +41,7 @@ func runUpdate(dockerCli *client.DockerCli, flags *pflag.FlagSet, serviceID stri
client := dockerCli.Client() client := dockerCli.Client()
ctx := context.Background() ctx := context.Background()
service, err := client.ServiceInspect(ctx, serviceID) service, _, err := client.ServiceInspectWithRaw(ctx, serviceID)
if err != nil { if err != nil {
return err return err
} }