Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #39208 from thaJeztah/bump_api_version
Browse files Browse the repository at this point in the history
Bump API version to v1.41
Upstream-commit: f4b9142210e9853ec454b6646ad2a38e0f77cd40
Component: engine
  • Loading branch information
cpuguy83 authored May 15, 2019
2 parents c05b738 + 8ba9980 commit 8a2b363
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion components/engine/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.40"
DefaultVersion = "1.41"

// NoBaseImageSpecifier is the symbol used by the FROM
// command to specify that no base image is to be used.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,8 @@ func (s *containerRouter) postContainersCreate(ctx context.Context, w http.Respo
if hostConfig.IpcMode.IsEmpty() {
hostConfig.IpcMode = container.IpcMode("shareable")
}

}
if hostConfig != nil && versions.LessThan(version, "1.41") {
// Older clients expect the default to be "host"
if hostConfig.CgroupnsMode.IsEmpty() {
hostConfig.CgroupnsMode = container.CgroupnsMode("host")
Expand Down
8 changes: 4 additions & 4 deletions components/engine/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.40"
basePath: "/v1.41"
info:
title: "Docker Engine API"
version: "1.40"
version: "1.41"
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.40) is used.
For example, calling `/info` is the same as calling `/v1.40/info`. Using the
If you omit the version-prefix, the current version of the API (v1.41) is used.
For example, calling `/info` is the same as calling `/v1.41/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
16 changes: 11 additions & 5 deletions components/engine/docs/api/version-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ keywords: "API, Docker, rcli, REST, documentation"
will be rejected.
-->

## v1.41 API changes

[Docker Engine API v1.41](https://docs.docker.com/engine/api/v1.41/) documentation

* `POST /containers/create` on Linux now accepts the `HostConfig.CgroupnsMode` property.
Set the property to `host` to create the container in the daemon's cgroup namespace, or
`private` to create the container in its own private cgroup namespace. The per-daemon
default is `host`, and can be changed by using the`CgroupNamespaceMode` daemon configuration
parameter.


## v1.40 API changes

[Docker Engine API v1.40](https://docs.docker.com/engine/api/v1.40/) documentation
Expand Down Expand Up @@ -68,11 +79,6 @@ keywords: "API, Docker, rcli, REST, documentation"
* `POST /containers/{id}/update` now accepts a `PidsLimit` field to tune a container's
PID limit. Set `0` or `-1` for unlimited. Leave `null` to not change the current value.
* `POST /build` now accepts `outputs` key for configuring build outputs when using BuildKit mode.
* `POST /containers/create` on Linux now accepts the `HostConfig.CgroupnsMode` property.
Set the property to `host` to create the container in the daemon's cgroup namespace, or
`private` to create the container in its own private cgroup namespace. The per-daemon
default is `host`, and can be changed by using the`CgroupNamespaceMode` daemon configuration
parameter.

## V1.39 API changes

Expand Down

0 comments on commit 8a2b363

Please sign in to comment.