From 17ee87b9ed34e510e960c1009635f6c3a2d97216 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 7 Dec 2017 13:52:49 -0800 Subject: [PATCH 1/2] Bump API version to 1.36 Signed-off-by: Sebastiaan van Stijn Upstream-commit: c1e982f2ee85580687e2d355af3ca444ada14d01 Component: engine --- components/engine/api/common.go | 2 +- components/engine/api/swagger.yaml | 8 ++++---- components/engine/docs/api/version-history.md | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/components/engine/api/common.go b/components/engine/api/common.go index af34d0b354..693d0a4eb0 100644 --- a/components/engine/api/common.go +++ b/components/engine/api/common.go @@ -3,7 +3,7 @@ package api // Common constants for daemon and client. const ( // DefaultVersion of Current REST API - DefaultVersion string = "1.35" + DefaultVersion string = "1.36" // NoBaseImageSpecifier is the symbol used by the FROM // command to specify that no base image is to be used. diff --git a/components/engine/api/swagger.yaml b/components/engine/api/swagger.yaml index b1533f6b71..73ea1a378c 100644 --- a/components/engine/api/swagger.yaml +++ b/components/engine/api/swagger.yaml @@ -19,10 +19,10 @@ produces: consumes: - "application/json" - "text/plain" -basePath: "/v1.35" +basePath: "/v1.36" info: title: "Docker Engine API" - version: "1.35" + version: "1.36" x-logo: url: "https://docs.docker.com/images/logo-docker-main.png" description: | @@ -49,8 +49,8 @@ info: the URL is not supported by the daemon, a HTTP `400 Bad Request` error message is returned. - If you omit the version-prefix, the current version of the API (v1.35) is used. - For example, calling `/info` is the same as calling `/v1.35/info`. Using the + If you omit the version-prefix, the current version of the API (v1.36) is used. + For example, calling `/info` is the same as calling `/v1.36/info`. Using the API without a version-prefix is deprecated and will be removed in a future release. Engine releases in the near future should support this version of the API, diff --git a/components/engine/docs/api/version-history.md b/components/engine/docs/api/version-history.md index 2ed2ae5d57..0fdf4648dc 100644 --- a/components/engine/docs/api/version-history.md +++ b/components/engine/docs/api/version-history.md @@ -13,6 +13,11 @@ keywords: "API, Docker, rcli, REST, documentation" will be rejected. --> +## v1.36 API changes + +[Docker Engine API v1.36](https://docs.docker.com/engine/api/v1.36/) documentation + + ## v1.35 API changes [Docker Engine API v1.35](https://docs.docker.com/engine/api/v1.35/) documentation From 141bc0558d7ad4cbe7b3dc91ba034d5ba18f8ff8 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 8 Dec 2017 09:20:56 -0500 Subject: [PATCH 2/2] Remove uneeded sleep in test bash loop This sleep probably doesn't work because sleep typically takes only whole numbers, to do < 1s you need to use usleep. It also is not really needed as the loop has a very low bound that will not eat up too much CPU. Signed-off-by: Brian Goff Upstream-commit: ee594dcb7d42f95048c9047d86c61447243db3cd Component: engine --- components/engine/integration-cli/docker_api_logs_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/integration-cli/docker_api_logs_test.go b/components/engine/integration-cli/docker_api_logs_test.go index 0672e328db..41164df314 100644 --- a/components/engine/integration-cli/docker_api_logs_test.go +++ b/components/engine/integration-cli/docker_api_logs_test.go @@ -151,7 +151,7 @@ func (s *DockerSuite) TestLogsAPIUntilFutureFollow(c *check.C) { func (s *DockerSuite) TestLogsAPIUntil(c *check.C) { name := "logsuntil" - dockerCmd(c, "run", "--name", name, "busybox", "/bin/sh", "-c", "for i in $(seq 1 3); do echo log$i; sleep 0.5; done") + dockerCmd(c, "run", "--name", name, "busybox", "/bin/sh", "-c", "for i in $(seq 1 3); do echo log$i; done") client, err := request.NewClient() if err != nil {