Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19.03 backport] Swagger Updates #41248

Merged
merged 9 commits into from Jul 27, 2020
Merged

[19.03 backport] Swagger Updates #41248

merged 9 commits into from Jul 27, 2020

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 23, 2020 •
edited

Backports of:

edigaryev and others added 9 commits July 23, 2020 13:15
@edigaryev @thaJeztah
swagger: clarify the meaning of Image field in ContainerInspect endpoint
7005841 
"Container's image" term is rather ambiguous: it can be both a name and an ID.

Looking at the sources[1], it's actually an image ID, so bring some clarity.

[1]: https://github.com/moby/moby/blob/a6a47d1a4944799ffbe3657d4dae68e0829a0dc6/daemon/inspect.go#L170

Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
(cherry picked from commit c44fb42)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
swagger: reformat, and wrap to ~80-chars
c30ff68 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3b261d7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
swagger: move NetworkingConfig to definitions
d742318 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 89876e8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
swagger: add DeviceRequests to container create, inspect example
630185b 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d4d62b6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@vivanov-dp @thaJeztah
docs: add example calculations to container stats API
0c6bdf5 
Signed-off-by: Velko Ivanov <vivanov@deeperplane.com>
(cherry picked from commit 4412119)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
docs: sync API v1.39 swagger formatting with current version
12b7746 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 63382e5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
docs: sync API v1.40 swagger formatting with current version
d5ba935 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 01244e8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
swagger: sync updates to v1.40
51bd95d 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e89ca4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
swagger: sync updates to v1.39
4d9397c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a8b2272)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 19.03.13 milestone Jul 23, 2020
cpuguy83
cpuguy83 approved these changes Jul 27, 2020
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83 cpuguy83 merged commit a7e3099 into moby:19.03 Jul 27, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_swagger_updates branch July 27, 2020 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
area/api area/docs status/3-docs-review
Projects
None yet
Milestone
19.03.13
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@thaJeztah @cpuguy83 @AkihiroSuda @edigaryev @vivanov-dp