From df5175e1ee955a429ac5a4f8bdfacffd4d066c26 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 24 May 2018 02:39:28 +0200 Subject: [PATCH 1/2] Bump API version to v1.38 Signed-off-by: Sebastiaan van Stijn --- api/common.go | 2 +- api/swagger.yaml | 8 ++++---- docs/api/version-history.md | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/api/common.go b/api/common.go index 4a0a5d5832..255a81aedd 100644 --- a/api/common.go +++ b/api/common.go @@ -3,7 +3,7 @@ package api // import "github.com/docker/docker/api" // Common constants for daemon and client. const ( // DefaultVersion of Current REST API - DefaultVersion = "1.37" + DefaultVersion = "1.38" // NoBaseImageSpecifier is the symbol used by the FROM // command to specify that no base image is to be used. diff --git a/api/swagger.yaml b/api/swagger.yaml index dcbed2a2c5..fe4e2d6494 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -19,10 +19,10 @@ produces: consumes: - "application/json" - "text/plain" -basePath: "/v1.37" +basePath: "/v1.38" info: title: "Docker Engine API" - version: "1.37" + version: "1.38" 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.37) is used. - For example, calling `/info` is the same as calling `/v1.37/info`. Using the + If you omit the version-prefix, the current version of the API (v1.38) is used. + For example, calling `/info` is the same as calling `/v1.38/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/docs/api/version-history.md b/docs/api/version-history.md index 8c56a1c19f..749d9788f6 100644 --- a/docs/api/version-history.md +++ b/docs/api/version-history.md @@ -15,6 +15,9 @@ keywords: "API, Docker, rcli, REST, documentation" ## V1.38 API changes +[Docker Engine API v1.38](https://docs.docker.com/engine/api/v1.38/) documentation + + * `GET /tasks` and `GET /tasks/{id}` now return a `NetworkAttachmentSpec` field, containing the `ContainerID` for non-service containers connected to "attachable" swarm-scoped networks. From a061b1e2d8f6117b0524e44de7b6bc391245864e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 24 May 2018 02:39:56 +0200 Subject: [PATCH 2/2] Adjust API version to match correct release This fix was not yet included in Docker 17.05, so API version v1.37 was not the right selector (Docker 18.03, 18.04 and 18.05 all support API v1.37). We should change these checks for engine versions, or use a different method to skip tests when running against older engines. Signed-off-by: Sebastiaan van Stijn --- integration/build/build_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/build/build_test.go b/integration/build/build_test.go index 83d992d14f..ee9631d3ff 100644 --- a/integration/build/build_test.go +++ b/integration/build/build_test.go @@ -175,7 +175,7 @@ func TestBuildMultiStageParentConfig(t *testing.T) { // Test cases in #36996 func TestBuildLabelWithTargets(t *testing.T) { - skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.37"), "test added after 1.37") + skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.38"), "test added after 1.38") bldName := "build-a" testLabels := map[string]string{ "foo": "bar",