From f29ee03a99a25c96b387b62459ac9d7fa13733ca Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Thu, 23 May 2019 15:14:34 +0200 Subject: [PATCH 1/5] API: Change type of RemotrAddrs to array of strings in operation SwarmJoin Signed-off-by: Dominic Tubach (cherry picked from commit d5f6bdb027596b44244a6ce50555664b3a5ee4a7) Signed-off-by: Sebastiaan van Stijn Upstream-commit: d359834555628f67693cdf7eda246835b659a41c Component: engine --- components/engine/api/swagger.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index ca9d29e021..6aeb711e59 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -8932,7 +8932,9 @@ paths: type: "string" RemoteAddrs: description: "Addresses of manager nodes already participating in the swarm." - type: "string" + type: "array" + items: + type: "string" JoinToken: description: "Secret token for joining this swarm." type: "string" From 02856b256b61b6a78e6b06490bb6f39510656fb4 Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Thu, 23 May 2019 16:03:48 +0200 Subject: [PATCH 2/5] API: Move "x-nullable: true" from type PortBinding to type PortMap Currently the API spec would allow `"443/tcp": [null]`, but what should be allowed is `"443/tcp": null` Signed-off-by: Dominic Tubach (cherry picked from commit 32b5d296ea5d392c28affe2854b9d4201166bc27) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 3ee1e060fc9a31844064035cc3e8b76fddb8b341 Component: engine --- components/engine/api/swagger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index 6aeb711e59..f8adfe9feb 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -1082,6 +1082,7 @@ definitions: type: "object" additionalProperties: type: "array" + x-nullable: true items: $ref: "#/definitions/PortBinding" example: @@ -1106,7 +1107,6 @@ definitions: PortBinding represents a binding between a host IP address and a host port. type: "object" - x-nullable: true properties: HostIp: description: "Host IP address that the container's port is mapped to." From 3e919def477cecbc408669b455c5cce9d80c6086 Mon Sep 17 00:00:00 2001 From: Adam Dobrawy Date: Thu, 23 May 2019 19:11:46 +0200 Subject: [PATCH 3/5] Update docs to remove restriction of tty resize Signed-off-by: Adam Dobrawy (cherry picked from commit 4898f493d86129684c29d6cdfc6f65b49eb2ed29) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2d1aa033a38e6a8b44b4a55a9285ebd80908e725 Component: engine --- components/engine/api/swagger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index f8adfe9feb..988f472dd8 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -5351,7 +5351,7 @@ paths: /containers/{id}/resize: post: summary: "Resize a container TTY" - description: "Resize the TTY for a container. You must restart the container for the resize to take effect." + description: "Resize the TTY for a container." operationId: "ContainerResize" consumes: - "application/octet-stream" From 861c5d670eb47348e367076a37ae979dfa5343d5 Mon Sep 17 00:00:00 2001 From: Dominic Tubach Date: Tue, 21 May 2019 17:09:18 +0200 Subject: [PATCH 4/5] API: Set format of body parameter in operation PutContainerArchive to "binary" Signed-off-by: Dominic Tubach (cherry picked from commit fa6f63e79b60d971460ee1fb8d449bdccc66cdfe) Signed-off-by: Sebastiaan van Stijn Upstream-commit: c3bf976a20ae18b628247088ff9935ce615337b8 Component: engine --- components/engine/api/swagger.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index 988f472dd8..5faabdc4a0 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -6111,6 +6111,7 @@ paths: description: "The input stream must be a tar archive compressed with one of the following algorithms: identity (no compression), gzip, bzip2, xz." schema: type: "string" + format: "binary" tags: ["Container"] /containers/prune: post: From 223d3e0c756314bcf079eb68f981224e9b23cce6 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Wed, 29 May 2019 16:33:56 +0800 Subject: [PATCH 5/5] fix: fix lack of copyUIDGID in swagger.yaml Signed-off-by: Zhang Yue Signed-off-by: zhangyue (cherry picked from commit a4f828cb8905f42c8b8975ce88e4d7aa8cd9bf74) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 705cc95eb1247c1983c39477f2ecf5cb4eb5edbb Component: engine --- components/engine/api/swagger.yaml | 4 ++++ components/engine/docs/api/version-history.md | 1 + 2 files changed, 5 insertions(+) diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index 5faabdc4a0..1cf310d689 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -6105,6 +6105,10 @@ paths: in: "query" description: "If “1”, “true”, or “True” then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa." type: "string" + - name: "copyUIDGID" + in: "query" + description: "If “1”, “true”, then it will copy UID/GID maps to the dest file or dir" + type: "string" - name: "inputStream" in: "body" required: true diff --git a/components/engine/docs/api/version-history.md b/components/engine/docs/api/version-history.md index 6f0083e90e..d98c16943a 100644 --- a/components/engine/docs/api/version-history.md +++ b/components/engine/docs/api/version-history.md @@ -159,6 +159,7 @@ keywords: "API, Docker, rcli, REST, documentation" * `GET /events` now supports service, node and secret events which are emitted when users create, update and remove service, node and secret * `GET /events` now supports network remove event which is emitted when users remove a swarm scoped network * `GET /events` now supports a filter type `scope` in which supported value could be swarm and local +* `PUT /containers/(name)/archive` now accepts a `copyUIDGID` parameter to allow copy UID/GID maps to dest file or dir. ## v1.29 API changes