Skip to content

Commit

Permalink
Merge pull request moby#37141 from thaJeztah/bump_api_v1_38
Browse files Browse the repository at this point in the history
Update API version to v1 38
  • Loading branch information
tiborvass authored May 25, 2018
2 parents 80bfcc3 + a061b1e commit 9c2c887
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion api/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions api/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions docs/api/version-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion integration/build/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 9c2c887

Please sign in to comment.