Merge pull request #37141 from thaJeztah/bump_api_v1_38

Update API version to v1 38
This commit is contained in:
Tibor Vass 2018-05-24 17:54:05 -10:00 committed by GitHub
commit 9c2c887b12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions

View File

@ -3,7 +3,7 @@ package api // import "github.com/docker/docker/api"
// Common constants for daemon and client. // Common constants for daemon and client.
const ( const (
// DefaultVersion of Current REST API // DefaultVersion of Current REST API
DefaultVersion = "1.37" DefaultVersion = "1.38"
// NoBaseImageSpecifier is the symbol used by the FROM // NoBaseImageSpecifier is the symbol used by the FROM
// command to specify that no base image is to be used. // command to specify that no base image is to be used.

View File

@ -19,10 +19,10 @@ produces:
consumes: consumes:
- "application/json" - "application/json"
- "text/plain" - "text/plain"
basePath: "/v1.37" basePath: "/v1.38"
info: info:
title: "Docker Engine API" title: "Docker Engine API"
version: "1.37" version: "1.38"
x-logo: x-logo:
url: "https://docs.docker.com/images/logo-docker-main.png" url: "https://docs.docker.com/images/logo-docker-main.png"
description: | description: |
@ -49,8 +49,8 @@ info:
the URL is not supported by the daemon, a HTTP `400 Bad Request` error message the URL is not supported by the daemon, a HTTP `400 Bad Request` error message
is returned. is returned.
If you omit the version-prefix, the current version of the API (v1.37) is used. 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.37/info`. Using the 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. 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, Engine releases in the near future should support this version of the API,

View File

@ -15,6 +15,9 @@ keywords: "API, Docker, rcli, REST, documentation"
## V1.38 API changes ## 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, * `GET /tasks` and `GET /tasks/{id}` now return a `NetworkAttachmentSpec` field,
containing the `ContainerID` for non-service containers connected to "attachable" containing the `ContainerID` for non-service containers connected to "attachable"
swarm-scoped networks. swarm-scoped networks.

View File

@ -175,7 +175,7 @@ func TestBuildMultiStageParentConfig(t *testing.T) {
// Test cases in #36996 // Test cases in #36996
func TestBuildLabelWithTargets(t *testing.T) { 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" bldName := "build-a"
testLabels := map[string]string{ testLabels := map[string]string{
"foo": "bar", "foo": "bar",