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

Commit a7781fa

Browse files
joelwurtzjoelwurtz
committed
Generate 1.35 version
1 parent d78422f commit a7781fa

26 files changed

+652
-423
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"extra": {
2626
"branch-alias": {
27-
"4.1.34": "4.1.34.x-dev"
27+
"4.1.35": "4.1.35.x-dev"
2828
}
2929
},
3030
"minimum-stability": "dev",

‎docker-swagger.yaml

Lines changed: 63 additions & 51 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.34"
22+
basePath: "/v1.35"
2323
info:
2424
title: "Docker Engine API"
25-
version: "1.34"
25+
version: "1.35"
2626
x-logo:
2727
url: "https://docs.docker.com/images/logo-docker-main.png"
2828
description: |
@@ -42,38 +42,26 @@ info:
4242
4343
# Versioning
4444
45-
The API is usually changed in each release of Docker, so API calls are versioned to ensure that clients don't break.
45+
The API is usually changed in each release, so API calls are versioned to
46+
ensure that clients don't break. To lock to a specific version of the API,
47+
you prefix the URL with its version, for example, call `/v1.30/info` to use
48+
the v1.30 version of the `/info` endpoint. If the API version specified in
49+
the URL is not supported by the daemon, a HTTP `400 Bad Request` error message
50+
is returned.
4651
47-
For Docker Engine 17.10, the API version is 1.33. To lock to this version, you prefix the URL with `/v1.33`. For example, calling `/info` is the same as calling `/v1.33/info`.
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
54+
API without a version-prefix is deprecated and will be removed in a future release.
4855
49-
Engine releases in the near future should support this version of the API, so your client will continue to work even if it is talking to a newer Engine.
56+
Engine releases in the near future should support this version of the API,
57+
so your client will continue to work even if it is talking to a newer Engine.
5058
51-
In previous versions of Docker, it was possible to access the API without providing a version. This behaviour is now deprecated will be removed in a future version of Docker.
59+
The API uses an open schema model, which means server may add extra properties
60+
to responses. Likewise, the server will ignore any extra query parameters and
61+
request body properties. When you write clients, you need to ignore additional
62+
properties in responses to ensure they do not break when talking to newer
63+
daemons.
5264
53-
If the API version specified in the URL is not supported by the daemon, a HTTP `400 Bad Request` error message is returned.
54-
55-
The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons.
56-
57-
This documentation is for version 1.34 of the API. Use this table to find documentation for previous versions of the API:
58-
59-
Docker version | API version | Changes
60-
----------------|-------------|---------
61-
17.10.x | [1.33](https://docs.docker.com/engine/api/v1.33/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-33-api-changes)
62-
17.09.x | [1.32](https://docs.docker.com/engine/api/v1.32/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-32-api-changes)
63-
17.07.x | [1.31](https://docs.docker.com/engine/api/v1.31/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-31-api-changes)
64-
17.06.x | [1.30](https://docs.docker.com/engine/api/v1.30/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-30-api-changes)
65-
17.05.x | [1.29](https://docs.docker.com/engine/api/v1.29/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-29-api-changes)
66-
17.04.x | [1.28](https://docs.docker.com/engine/api/v1.28/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-28-api-changes)
67-
17.03.1 | [1.27](https://docs.docker.com/engine/api/v1.27/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-27-api-changes)
68-
1.13.1 & 17.03.0 | [1.26](https://docs.docker.com/engine/api/v1.26/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-26-api-changes)
69-
1.13.0 | [1.25](https://docs.docker.com/engine/api/v1.25/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-25-api-changes)
70-
1.12.x | [1.24](https://docs.docker.com/engine/api/v1.24/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-24-api-changes)
71-
1.11.x | [1.23](https://docs.docker.com/engine/api/v1.23/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-23-api-changes)
72-
1.10.x | [1.22](https://docs.docker.com/engine/api/v1.22/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-22-api-changes)
73-
1.9.x | [1.21](https://docs.docker.com/engine/api/v1.21/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-21-api-changes)
74-
1.8.x | [1.20](https://docs.docker.com/engine/api/v1.20/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-20-api-changes)
75-
1.7.x | [1.19](https://docs.docker.com/engine/api/v1.19/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-19-api-changes)
76-
1.6.x | [1.18](https://docs.docker.com/engine/api/v1.18/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-18-api-changes)
7765
7866
# Authentication
7967
@@ -266,6 +254,7 @@ definitions:
266254
properties:
267255
Propagation:
268256
description: "A propagation mode with the value `[r]private`, `[r]shared`, or `[r]slave`."
257+
type: "string"
269258
enum:
270259
- "private"
271260
- "rprivate"
@@ -344,6 +333,7 @@ definitions:
344333
Memory:
345334
description: "Memory limit in bytes."
346335
type: "integer"
336+
format: "int64"
347337
default: 0
348338
# Applicable to UNIX platforms
349339
CgroupParent:
@@ -618,17 +608,7 @@ definitions:
618608
description: "Network mode to use for this container. Supported standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
619609
as a custom network's name to which this container should connect to."
620610
PortBindings:
621-
type: "object"
622-
description: "A map of exposed container ports and the host port they should map to."
623-
additionalProperties:
624-
type: "object"
625-
properties:
626-
HostIp:
627-
type: "string"
628-
description: "The host IP address"
629-
HostPort:
630-
type: "string"
631-
description: "The host port number, as a string"
611+
$ref: "#/definitions/PortMap"
632612
RestartPolicy:
633613
$ref: "#/definitions/RestartPolicy"
634614
AutoRemove:
@@ -844,9 +824,7 @@ definitions:
844824
type: "string"
845825
Cmd:
846826
description: "Command to run specified as a string or an array of strings."
847-
type:
848-
- "array"
849-
- "string"
827+
type: "array"
850828
items:
851829
type: "string"
852830
Healthcheck:
@@ -874,9 +852,7 @@ definitions:
874852
The entry point for the container as a string or an array of strings.
875853
876854
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
877-
type:
878-
- "array"
879-
- "string"
855+
type: "array"
880856
items:
881857
type: "string"
882858
NetworkDisabled:
@@ -2688,7 +2664,13 @@ definitions:
26882664
ConfigName is the name of the config that this references, but this is just provided for
26892665
lookup/display purposes. The config in the reference will be identified by its ID.
26902666
type: "string"
2691-
2667+
Isolation:
2668+
type: "string"
2669+
description: "Isolation technology of the containers running the service. (Windows only)"
2670+
enum:
2671+
- "default"
2672+
- "process"
2673+
- "hyperv"
26922674
Resources:
26932675
description: "Resource requirements which apply to each individual container created as part of the service."
26942676
type: "object"
@@ -4514,7 +4496,7 @@ paths:
45144496
x-nullable: false
45154497
Warnings:
45164498
description: "Warnings encountered when creating the container"
4517-
type: ["array", "null"]
4499+
type: "array"
45184500
x-nullable: false
45194501
items:
45204502
type: "string"
@@ -4962,6 +4944,11 @@ paths:
49624944
description: "Only return logs since this time, as a UNIX timestamp"
49634945
type: "integer"
49644946
default: 0
4947+
- name: "until"
4948+
in: "query"
4949+
description: "Only return logs before this time, as a UNIX timestamp"
4950+
type: "integer"
4951+
default: 0
49654952
- name: "timestamps"
49664953
in: "query"
49674954
description: "Add timestamps to every log line"
@@ -6770,6 +6757,28 @@ paths:
67706757
schema:
67716758
type: "object"
67726759
properties:
6760+
Platform:
6761+
type: "object"
6762+
required: [Name]
6763+
properties:
6764+
Name:
6765+
type: "string"
6766+
Components:
6767+
type: "array"
6768+
items:
6769+
type: "object"
6770+
x-go-name: ComponentVersion
6771+
required: [Name, Version]
6772+
properties:
6773+
Name:
6774+
type: "string"
6775+
Version:
6776+
type: "string"
6777+
x-nullable: false
6778+
Details:
6779+
type: "object"
6780+
x-nullable: true
6781+
67736782
Version:
67746783
type: "string"
67756784
ApiVersion:
@@ -6992,7 +7001,7 @@ paths:
69927001
- `network=<string>` network name or ID
69937002
- `node=<string>` node ID
69947003
- `plugin`=<string> plugin name or ID
6995-
- `scope`＝<string> local or swarm
7004+
- `scope`=<string> local or swarm
69967005
- `secret=<string>` secret name or ID
69977006
- `service=<string>` service name or ID
69987007
- `type=<string>` object to filter by, one of `container`, `image`, `volume`, `network`, `daemon`, `plugin`, `node`, `service`, `secret` or `config`
@@ -7265,6 +7274,9 @@ paths:
72657274
User:
72667275
type: "string"
72677276
description: "The user, and optionally, group to run the exec process inside the container. Format is one of: `user`, `user:group`, `uid`, or `uid:gid`."
7277+
WorkingDir:
7278+
type: "string"
7279+
description: "The working directory for the exec process inside the container."
72687280
example:
72697281
AttachStdin: false
72707282
AttachStdout: true
@@ -7888,7 +7900,7 @@ paths:
78887900
summary: "Connect a container to a network"
78897901
operationId: "NetworkConnect"
78907902
consumes:
7891-
- "application/octet-stream"
7903+
- "application/json"
78927904
responses:
78937905
200:
78947906
description: "No error"

‎src/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static function create($httpClient = null)
3434
if (null === $httpClient) {
3535
$httpClient = \Http\Discovery\HttpClientDiscovery::find();
3636
$plugins = [];
37-
$uri = \Http\Discovery\UriFactoryDiscovery::find()->createUri('v1.34');
37+
$uri = \Http\Discovery\UriFactoryDiscovery::find()->createUri('v1.35');
3838
$plugins[] = new \Http\Client\Common\Plugin\AddPathPlugin($uri);
3939
$httpClient = new \Http\Client\Common\PluginClient($httpClient, $plugins);
4040
}

‎src/Model/ContainerConfig.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ContainerConfig
8484
/**
8585
* Command to run specified as a string or an array of strings.
8686
*
87-
* @var string[]|string
87+
* @var string[]
8888
*/
8989
protected $cmd;
9090
/**
@@ -123,7 +123,7 @@ class ContainerConfig
123123
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
124124
125125
*
126-
* @var string[]|string
126+
* @var string[]
127127
*/
128128
protected $entrypoint;
129129
/**
@@ -442,21 +442,21 @@ public function setEnv(?array $env): self
442442
/**
443443
* Command to run specified as a string or an array of strings.
444444
*
445-
* @return string[]|string
445+
* @return string[]
446446
*/
447-
public function getCmd()
447+
public function getCmd(): ?array
448448
{
449449
return $this->cmd;
450450
}
451451

452452
/**
453453
* Command to run specified as a string or an array of strings.
454454
*
455-
* @param string[]|string $cmd
455+
* @param string[] $cmd
456456
*
457457
* @return self
458458
*/
459-
public function setCmd($cmd): self
459+
public function setCmd(?array $cmd): self
460460
{
461461
$this->cmd = $cmd;
462462

@@ -589,9 +589,9 @@ public function setWorkingDir(?string $workingDir): self
589589
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
590590
591591
*
592-
* @return string[]|string
592+
* @return string[]
593593
*/
594-
public function getEntrypoint()
594+
public function getEntrypoint(): ?array
595595
{
596596
return $this->entrypoint;
597597
}
@@ -602,11 +602,11 @@ public function getEntrypoint()
602602
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
603603
604604
*
605-
* @param string[]|string $entrypoint
605+
* @param string[] $entrypoint
606606
*
607607
* @return self
608608
*/
609-
public function setEntrypoint($entrypoint): self
609+
public function setEntrypoint(?array $entrypoint): self
610610
{
611611
$this->entrypoint = $entrypoint;
612612

‎src/Model/ContainersCreatePostBody.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class ContainersCreatePostBody
8484
/**
8585
* Command to run specified as a string or an array of strings.
8686
*
87-
* @var string[]|string
87+
* @var string[]
8888
*/
8989
protected $cmd;
9090
/**
@@ -123,7 +123,7 @@ class ContainersCreatePostBody
123123
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
124124
125125
*
126-
* @var string[]|string
126+
* @var string[]
127127
*/
128128
protected $entrypoint;
129129
/**
@@ -454,21 +454,21 @@ public function setEnv(?array $env): self
454454
/**
455455
* Command to run specified as a string or an array of strings.
456456
*
457-
* @return string[]|string
457+
* @return string[]
458458
*/
459-
public function getCmd()
459+
public function getCmd(): ?array
460460
{
461461
return $this->cmd;
462462
}
463463

464464
/**
465465
* Command to run specified as a string or an array of strings.
466466
*
467-
* @param string[]|string $cmd
467+
* @param string[] $cmd
468468
*
469469
* @return self
470470
*/
471-
public function setCmd($cmd): self
471+
public function setCmd(?array $cmd): self
472472
{
473473
$this->cmd = $cmd;
474474

@@ -601,9 +601,9 @@ public function setWorkingDir(?string $workingDir): self
601601
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
602602
603603
*
604-
* @return string[]|string
604+
* @return string[]
605605
*/
606-
public function getEntrypoint()
606+
public function getEntrypoint(): ?array
607607
{
608608
return $this->entrypoint;
609609
}
@@ -614,11 +614,11 @@ public function getEntrypoint()
614614
If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
615615
616616
*
617-
* @param string[]|string $entrypoint
617+
* @param string[] $entrypoint
618618
*
619619
* @return self
620620
*/
621-
public function setEntrypoint($entrypoint): self
621+
public function setEntrypoint(?array $entrypoint): self
622622
{
623623
$this->entrypoint = $entrypoint;
624624

0 commit comments

Comments
 (0)