Skip to content
This repository was archived by the owner on Oct 26, 2019. It is now read-only.

Commit ba4cf2d

Browse files
joelwurtzjoelwurtz
committed
Add 1.36 api version
1 parent 6d9e057 commit ba4cf2d

19 files changed

+220
-168
lines changed

‎docker-swagger.yaml‎

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ produces:
1919
consumes:
2020
- "application/json"
2121
- "text/plain"
22-
basePath: "/v1.35"
22+
basePath: "/v1.36"
2323
info:
2424
title: "Docker Engine API"
25-
version: "1.35"
25+
version: "1.36"
2626
x-logo:
2727
url: "https://docs.docker.com/images/logo-docker-main.png"
2828
description: |
@@ -49,8 +49,8 @@ info:
4949
the URL is not supported by the daemon, a HTTP `400 Bad Request` error message
5050
is returned.
5151
52-
If you omit the version-prefix, the current version of the API (v1.35) is used.
53-
For example, calling `/info` is the same as calling `/v1.35/info`. Using the
52+
If you omit the version-prefix, the current version of the API (v1.36) is used.
53+
For example, calling `/info` is the same as calling `/v1.36/info`. Using the
5454
API without a version-prefix is deprecated and will be removed in a future release.
5555
5656
Engine releases in the near future should support this version of the API,
@@ -1496,10 +1496,23 @@ definitions:
14961496
type: "string"
14971497
progressDetail:
14981498
$ref: "#/definitions/ProgressDetail"
1499+
aux:
1500+
$ref: "#/definitions/ImageID"
1501+
1502+
ImageID:
1503+
type: "object"
1504+
description: "Image ID or Digest"
1505+
properties:
1506+
ID:
1507+
type: "string"
1508+
example:
1509+
ID: "sha256:85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c"
14991510

15001511
CreateImageInfo:
15011512
type: "object"
15021513
properties:
1514+
id:
1515+
type: "string"
15031516
error:
15041517
type: "string"
15051518
status:
@@ -1532,9 +1545,9 @@ definitions:
15321545
ProgressDetail:
15331546
type: "object"
15341547
properties:
1535-
code:
1548+
current:
15361549
type: "integer"
1537-
message:
1550+
total:
15381551
type: "integer"
15391552

15401553
ErrorResponse:
@@ -4488,6 +4501,8 @@ paths:
44884501
description: "Container created successfully"
44894502
schema:
44904503
type: "object"
4504+
title: "ContainerCreateResponse"
4505+
description: "OK response to ContainerCreate operation"
44914506
required: [Id, Warnings]
44924507
properties:
44934508
Id:
@@ -4536,6 +4551,7 @@ paths:
45364551
description: "no error"
45374552
schema:
45384553
type: "object"
4554+
title: "ContainerInspectResponse"
45394555
properties:
45404556
Id:
45414557
description: "The ID of the container"
@@ -4820,6 +4836,8 @@ paths:
48204836
description: "no error"
48214837
schema:
48224838
type: "object"
4839+
title: "ContainerTopResponse"
4840+
description: "OK response to ContainerTop operation"
48234841
properties:
48244842
Titles:
48254843
description: "The ps column titles"
@@ -4980,6 +4998,8 @@ paths:
49804998
items:
49814999
type: "object"
49825000
x-go-name: "ContainerChangeResponseItem"
5001+
title: "ContainerChangeResponseItem"
5002+
description: "change item in response to ContainerChanges operation"
49835003
required: [Path, Kind]
49845004
properties:
49855005
Path:
@@ -5358,6 +5378,8 @@ paths:
53585378
description: "The container has been updated."
53595379
schema:
53605380
type: "object"
5381+
title: "ContainerUpdateResponse"
5382+
description: "OK response to ContainerUpdate operation"
53615383
properties:
53625384
Warnings:
53635385
type: "array"
@@ -5711,6 +5733,8 @@ paths:
57115733
description: "The container has exit."
57125734
schema:
57135735
type: "object"
5736+
title: "ContainerWaitResponse"
5737+
description: "OK response to ContainerWait operation"
57145738
required: [StatusCode]
57155739
properties:
57165740
StatusCode:
@@ -5956,6 +5980,7 @@ paths:
59565980
description: "No error"
59575981
schema:
59585982
type: "object"
5983+
title: "ContainerPruneResponse"
59595984
properties:
59605985
ContainersDeleted:
59615986
description: "Container IDs that were deleted"
@@ -6209,6 +6234,7 @@ paths:
62096234
description: "No error"
62106235
schema:
62116236
type: "object"
6237+
title: "BuildPruneResponse"
62126238
properties:
62136239
SpaceReclaimed:
62146240
description: "Disk space reclaimed in bytes"
@@ -6394,6 +6420,8 @@ paths:
63946420
items:
63956421
type: "object"
63966422
x-go-name: HistoryResponseItem
6423+
title: "HistoryResponseItem"
6424+
description: "individual image layer information in response to ImageHistory operation"
63976425
required: [Id, Created, CreatedBy, Tags, Size, Comment]
63986426
properties:
63996427
Id:
@@ -6600,6 +6628,7 @@ paths:
66006628
type: "array"
66016629
items:
66026630
type: "object"
6631+
title: "ImageSearchResponseItem"
66036632
properties:
66046633
description:
66056634
type: "string"
@@ -6675,6 +6704,7 @@ paths:
66756704
description: "No error"
66766705
schema:
66776706
type: "object"
6707+
title: "ImagePruneResponse"
66786708
properties:
66796709
ImagesDeleted:
66806710
description: "Images that were deleted"
@@ -6702,6 +6732,7 @@ paths:
67026732
description: "An identity token was generated successfully."
67036733
schema:
67046734
type: "object"
6735+
title: "SystemAuthResponse"
67056736
required: [Status]
67066737
properties:
67076738
Status:
@@ -6756,6 +6787,7 @@ paths:
67566787
description: "no error"
67576788
schema:
67586789
type: "object"
6790+
title: "SystemVersionResponse"
67596791
properties:
67606792
Platform:
67616793
type: "object"
@@ -6908,7 +6940,7 @@ paths:
69086940
69096941
Various objects within Docker report events when something happens to them.
69106942
6911-
Containers report these events: `attach`, `commit`, `copy`, `create`, `destroy`, `detach`, `die`, `exec_create`, `exec_detach`, `exec_start`, `export`, `health_status`, `kill`, `oom`, `pause`, `rename`, `resize`, `restart`, `start`, `stop`, `top`, `unpause`, and `update`
6943+
Containers report these events: `attach`, `commit`, `copy`, `create`, `destroy`, `detach`, `die`, `exec_create`, `exec_detach`, `exec_start`, `exec_die`, `export`, `health_status`, `kill`, `oom`, `pause`, `rename`, `resize`, `restart`, `start`, `stop`, `top`, `unpause`, and `update`
69126944
69136945
Images report these events: `delete`, `import`, `load`, `pull`, `push`, `save`, `tag`, and `untag`
69146946
@@ -6934,6 +6966,7 @@ paths:
69346966
description: "no error"
69356967
schema:
69366968
type: "object"
6969+
title: "SystemEventsResponse"
69376970
properties:
69386971
Type:
69396972
description: "The type of object emitting the event"
@@ -7017,6 +7050,7 @@ paths:
70177050
description: "no error"
70187051
schema:
70197052
type: "object"
7053+
title: "SystemDataUsageResponse"
70207054
properties:
70217055
LayersSize:
70227056
type: "integer"
@@ -7375,7 +7409,12 @@ paths:
73757409
description: "No error"
73767410
schema:
73777411
type: "object"
7412+
title: "ExecInspectResponse"
73787413
properties:
7414+
CanRemove:
7415+
type: "boolean"
7416+
DetachKeys:
7417+
type: "string"
73797418
ID:
73807419
type: "string"
73817420
Running:
@@ -7441,6 +7480,7 @@ paths:
74417480
description: "Summary volume data that matches the query"
74427481
schema:
74437482
type: "object"
7483+
title: "VolumeListResponse"
74447484
required: [Volumes, Warnings]
74457485
properties:
74467486
Volumes:
@@ -7622,6 +7662,7 @@ paths:
76227662
description: "No error"
76237663
schema:
76247664
type: "object"
7665+
title: "VolumePruneResponse"
76257666
properties:
76267667
VolumesDeleted:
76277668
description: "Volumes that were deleted"
@@ -7800,6 +7841,7 @@ paths:
78007841
description: "No error"
78017842
schema:
78027843
type: "object"
7844+
title: "NetworkCreateResponse"
78037845
properties:
78047846
Id:
78057847
description: "The ID of the created network."
@@ -8002,6 +8044,7 @@ paths:
80028044
description: "No error"
80038045
schema:
80048046
type: "object"
8047+
title: "NetworkPruneResponse"
80058048
properties:
80068049
NetworksDeleted:
80078050
description: "Networks that were deleted"
@@ -8053,6 +8096,7 @@ paths:
80538096
items:
80548097
description: "Describes a permission the user has to accept upon installing the plugin."
80558098
type: "object"
8099+
title: "PluginPrivilegeItem"
80568100
properties:
80578101
Name:
80588102
type: "string"
@@ -8755,6 +8799,7 @@ paths:
87558799
description: "no error"
87568800
schema:
87578801
type: "object"
8802+
title: "UnlockKeyResponse"
87588803
properties:
87598804
UnlockKey:
87608805
description: "The swarm's unlock key."
@@ -8846,6 +8891,7 @@ paths:
88468891
description: "no error"
88478892
schema:
88488893
type: "object"
8894+
title: "ServiceCreateResponse"
88498895
properties:
88508896
ID:
88518897
description: "The ID of the created service."
@@ -9513,13 +9559,7 @@ paths:
95139559
201:
95149560
description: "no error"
95159561
schema:
9516-
type: "object"
9517-
properties:
9518-
ID:
9519-
description: "The ID of the created secret."
9520-
type: "string"
9521-
example:
9522-
ID: "ktnbjxoalbkvbvedmg1urrz8h"
9562+
$ref: "#/definitions/IdResponse"
95239563
409:
95249564
description: "name conflicts with an existing object"
95259565
schema:
@@ -9718,13 +9758,7 @@ paths:
97189758
201:
97199759
description: "no error"
97209760
schema:
9721-
type: "object"
9722-
properties:
9723-
ID:
9724-
description: "The ID of the created config."
9725-
type: "string"
9726-
example:
9727-
ID: "ktnbjxoalbkvbvedmg1urrz8h"
9761+
$ref: "#/definitions/IdResponse"
97289762
409:
97299763
description: "name conflicts with an existing object"
97309764
schema:
@@ -9870,6 +9904,7 @@ paths:
98709904
schema:
98719905
type: "object"
98729906
x-go-name: DistributionInspect
9907+
title: "DistributionInspectResponse"
98739908
required: [Descriptor, Platforms]
98749909
properties:
98759910
Descriptor:

‎src/Client.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ public function imageCommit(\Docker\API\Model\ContainerConfig $containerConfig,
987987
988988
Various objects within Docker report events when something happens to them.
989989
990-
Containers report these events: `attach`, `commit`, `copy`, `create`, `destroy`, `detach`, `die`, `exec_create`, `exec_detach`, `exec_start`, `export`, `health_status`, `kill`, `oom`, `pause`, `rename`, `resize`, `restart`, `start`, `stop`, `top`, `unpause`, and `update`
990+
Containers report these events: `attach`, `commit`, `copy`, `create`, `destroy`, `detach`, `die`, `exec_create`, `exec_detach`, `exec_start`, `exec_die`, `export`, `health_status`, `kill`, `oom`, `pause`, `rename`, `resize`, `restart`, `start`, `stop`, `top`, `unpause`, and `update`
991991
992992
Images report these events: `delete`, `import`, `load`, `pull`, `push`, `save`, `tag`, and `untag`
993993
@@ -2022,7 +2022,7 @@ public function secretList(array $queryParameters = [], string $fetch = self::FE
20222022
* @throws \Docker\API\Exception\SecretCreateInternalServerErrorException
20232023
* @throws \Docker\API\Exception\SecretCreateServiceUnavailableException
20242024
*
2025-
* @return null|\Docker\API\Model\SecretsCreatePostResponse201|\Psr\Http\Message\ResponseInterface
2025+
* @return null|\Docker\API\Model\IdResponse|\Psr\Http\Message\ResponseInterface
20262026
*/
20272027
public function secretCreate(\Docker\API\Model\SecretsCreatePostBody $body, string $fetch = self::FETCH_OBJECT)
20282028
{
@@ -2107,7 +2107,7 @@ public function configList(array $queryParameters = [], string $fetch = self::FE
21072107
* @throws \Docker\API\Exception\ConfigCreateInternalServerErrorException
21082108
* @throws \Docker\API\Exception\ConfigCreateServiceUnavailableException
21092109
*
2110-
* @return null|\Docker\API\Model\ConfigsCreatePostResponse201|\Psr\Http\Message\ResponseInterface
2110+
* @return null|\Docker\API\Model\IdResponse|\Psr\Http\Message\ResponseInterface
21112111
*/
21122112
public function configCreate(\Docker\API\Model\ConfigsCreatePostBody $body, string $fetch = self::FETCH_OBJECT)
21132113
{
@@ -2200,7 +2200,7 @@ public static function create($httpClient = null)
22002200
if (null === $httpClient) {
22012201
$httpClient = \Http\Discovery\HttpClientDiscovery::find();
22022202
$plugins = [];
2203-
$uri = \Http\Discovery\UriFactoryDiscovery::find()->createUri('v1.35');
2203+
$uri = \Http\Discovery\UriFactoryDiscovery::find()->createUri('v1.36');
22042204
$plugins[] = new \Http\Client\Common\Plugin\AddPathPlugin($uri);
22052205
$httpClient = new \Http\Client\Common\PluginClient($httpClient, $plugins);
22062206
}

‎src/ClientAsync.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ public function imageCommit(\Docker\API\Model\ContainerConfig $containerConfig,
987987
988988
Various objects within Docker report events when something happens to them.
989989
990-
Containers report these events: `attach`, `commit`, `copy`, `create`, `destroy`, `detach`, `die`, `exec_create`, `exec_detach`, `exec_start`, `export`, `health_status`, `kill`, `oom`, `pause`, `rename`, `resize`, `restart`, `start`, `stop`, `top`, `unpause`, and `update`
990+
Containers report these events: `attach`, `commit`, `copy`, `create`, `destroy`, `detach`, `die`, `exec_create`, `exec_detach`, `exec_start`, `exec_die`, `export`, `health_status`, `kill`, `oom`, `pause`, `rename`, `resize`, `restart`, `start`, `stop`, `top`, `unpause`, and `update`
991991
992992
Images report these events: `delete`, `import`, `load`, `pull`, `push`, `save`, `tag`, and `untag`
993993
@@ -2022,7 +2022,7 @@ public function secretList(array $queryParameters = [], string $fetch = self::FE
20222022
* @throws \Docker\API\Exception\SecretCreateInternalServerErrorException
20232023
* @throws \Docker\API\Exception\SecretCreateServiceUnavailableException
20242024
*
2025-
* @return \Amp\Promise<null|\Docker\API\Model\SecretsCreatePostResponse201|\Amp\Artax\Response>
2025+
* @return \Amp\Promise<null|\Docker\API\Model\IdResponse|\Amp\Artax\Response>
20262026
*/
20272027
public function secretCreate(\Docker\API\Model\SecretsCreatePostBody $body, string $fetch = self::FETCH_OBJECT)
20282028
{
@@ -2107,7 +2107,7 @@ public function configList(array $queryParameters = [], string $fetch = self::FE
21072107
* @throws \Docker\API\Exception\ConfigCreateInternalServerErrorException
21082108
* @throws \Docker\API\Exception\ConfigCreateServiceUnavailableException
21092109
*
2110-
* @return \Amp\Promise<null|\Docker\API\Model\ConfigsCreatePostResponse201|\Amp\Artax\Response>
2110+
* @return \Amp\Promise<null|\Docker\API\Model\IdResponse|\Amp\Artax\Response>
21112111
*/
21122112
public function configCreate(\Docker\API\Model\ConfigsCreatePostBody $body, string $fetch = self::FETCH_OBJECT)
21132113
{

‎src/Endpoint/ConfigCreate.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public function getExtraHeaders(): array
4949
* @throws \Docker\API\Exception\ConfigCreateInternalServerErrorException
5050
* @throws \Docker\API\Exception\ConfigCreateServiceUnavailableException
5151
*
52-
* @return null|\Docker\API\Model\ConfigsCreatePostResponse201
52+
* @return null|\Docker\API\Model\IdResponse
5353
*/
5454
protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer)
5555
{
5656
if (201 === $status) {
57-
return $serializer->deserialize($body, 'Docker\\API\\Model\\ConfigsCreatePostResponse201', 'json');
57+
return $serializer->deserialize($body, 'Docker\\API\\Model\\IdResponse', 'json');
5858
}
5959
if (409 === $status) {
6060
throw new \Docker\API\Exception\ConfigCreateConflictException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'));

‎src/Endpoint/SecretCreate.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public function getExtraHeaders(): array
4949
* @throws \Docker\API\Exception\SecretCreateInternalServerErrorException
5050
* @throws \Docker\API\Exception\SecretCreateServiceUnavailableException
5151
*
52-
* @return null|\Docker\API\Model\SecretsCreatePostResponse201
52+
* @return null|\Docker\API\Model\IdResponse
5353
*/
5454
protected function transformResponseBody(string $body, int $status, \Symfony\Component\Serializer\SerializerInterface $serializer)
5555
{
5656
if (201 === $status) {
57-
return $serializer->deserialize($body, 'Docker\\API\\Model\\SecretsCreatePostResponse201', 'json');
57+
return $serializer->deserialize($body, 'Docker\\API\\Model\\IdResponse', 'json');
5858
}
5959
if (409 === $status) {
6060
throw new \Docker\API\Exception\SecretCreateConflictException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'));

0 commit comments

Comments
 (0)