Browse code

Update ServiceInspectWithRaw

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Vincent Demeester authored on 2016/06/17 07:47:22
Showing 5 changed files
... ...
@@ -40,7 +40,7 @@ func (r *IDResolver) get(ctx context.Context, t interface{}, id string) (string,
40 40
 		}
41 41
 		return id, nil
42 42
 	case swarm.Service:
43
-		service, err := r.client.ServiceInspect(ctx, id)
43
+		service, _, err := r.client.ServiceInspectWithRaw(ctx, id)
44 44
 		if err != nil {
45 45
 			return id, nil
46 46
 		}
... ...
@@ -50,7 +50,7 @@ func runInspect(dockerCli *client.DockerCli, opts inspectOptions) error {
50 50
 	ctx := context.Background()
51 51
 
52 52
 	getRef := func(ref string) (interface{}, []byte, error) {
53
-		service, err := client.ServiceInspect(ctx, ref)
53
+		service, _, err := client.ServiceInspectWithRaw(ctx, ref)
54 54
 		if err == nil || !apiclient.IsErrServiceNotFound(err) {
55 55
 			return service, nil, err
56 56
 		}
... ...
@@ -61,7 +61,8 @@ func runServiceScale(dockerCli *client.DockerCli, serviceID string, scale string
61 61
 	client := dockerCli.Client()
62 62
 	ctx := context.Background()
63 63
 
64
-	service, err := client.ServiceInspect(ctx, serviceID)
64
+	service, _, err := client.ServiceInspectWithRaw(ctx, serviceID)
65
+
65 66
 	if err != nil {
66 67
 		return err
67 68
 	}
... ...
@@ -44,7 +44,7 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
44 44
 	client := dockerCli.Client()
45 45
 	ctx := context.Background()
46 46
 
47
-	service, err := client.ServiceInspect(ctx, opts.serviceID)
47
+	service, _, err := client.ServiceInspectWithRaw(ctx, opts.serviceID)
48 48
 	if err != nil {
49 49
 		return err
50 50
 	}
... ...
@@ -41,7 +41,7 @@ func runUpdate(dockerCli *client.DockerCli, flags *pflag.FlagSet, serviceID stri
41 41
 	client := dockerCli.Client()
42 42
 	ctx := context.Background()
43 43
 
44
-	service, err := client.ServiceInspect(ctx, serviceID)
44
+	service, _, err := client.ServiceInspectWithRaw(ctx, serviceID)
45 45
 	if err != nil {
46 46
 		return err
47 47
 	}