Browse code

Update swagger and API history

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2018/05/23 06:37:33
Showing 2 changed files
... ...
@@ -2449,7 +2449,15 @@ definitions:
2449 2449
     properties:
2450 2450
       PluginSpec:
2451 2451
         type: "object"
2452
-        description: "Invalid when specified with `ContainerSpec`. *(Experimental release only.)*"
2452
+        description: |
2453
+          Plugin spec for the service.  *(Experimental release only.)*
2454
+
2455
+          <p><br /></p>
2456
+
2457
+          > **Note**: ContainerSpec, NetworkAttachmentSpec, and PluginSpec are
2458
+          > mutually exclusive. PluginSpec is only used when the Runtime field
2459
+          > is set to `plugin`. NetworkAttachmentSpec is used when the Runtime
2460
+          > field is set to `attachment`.
2453 2461
         properties:
2454 2462
           Name:
2455 2463
             description: "The name or 'alias' to use for the plugin."
... ...
@@ -2476,7 +2484,15 @@ definitions:
2476 2476
                     type: "string"
2477 2477
       ContainerSpec:
2478 2478
         type: "object"
2479
-        description: "Invalid when specified with `PluginSpec`."
2479
+        description: |
2480
+          Container spec for the service.
2481
+
2482
+          <p><br /></p>
2483
+
2484
+          > **Note**: ContainerSpec, NetworkAttachmentSpec, and PluginSpec are
2485
+          > mutually exclusive. PluginSpec is only used when the Runtime field
2486
+          > is set to `plugin`. NetworkAttachmentSpec is used when the Runtime
2487
+          > field is set to `attachment`.
2480 2488
         properties:
2481 2489
           Image:
2482 2490
             description: "The image name to use for the container"
... ...
@@ -2689,7 +2705,16 @@ definitions:
2689 2689
               - "process"
2690 2690
               - "hyperv"
2691 2691
       NetworkAttachmentSpec:
2692
-        description: "Read-only spec type for non-swarm containers attached to swarm overlay networks"
2692
+        description: |
2693
+          Read-only spec type for non-swarm containers attached to swarm overlay
2694
+          networks.
2695
+
2696
+          <p><br /></p>
2697
+
2698
+          > **Note**: ContainerSpec, NetworkAttachmentSpec, and PluginSpec are
2699
+          > mutually exclusive. PluginSpec is only used when the Runtime field
2700
+          > is set to `plugin`. NetworkAttachmentSpec is used when the Runtime
2701
+          > field is set to `attachment`.
2693 2702
         type: "object"
2694 2703
         properties:
2695 2704
           ContainerID:
... ...
@@ -13,6 +13,12 @@ keywords: "API, Docker, rcli, REST, documentation"
13 13
      will be rejected.
14 14
 -->
15 15
 
16
+## V1.38 API changes
17
+
18
+* `GET /tasks` and `GET /tasks/{id}` now return a `NetworkAttachmentSpec` field,
19
+  containing the `ContainerID` for non-service containers connected to "attachable"
20
+  swarm-scoped networks.
21
+
16 22
 ## v1.37 API changes
17 23
 
18 24
 [Docker Engine API v1.37](https://docs.docker.com/engine/api/v1.37/) documentation