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

Commit 1015e8a

Browse files
GordonTheTurtleGordonTheTurtle
committed
Merge component 'engine' from git@github.com:moby/moby 19.03
2 parents 120511a + 1d7d9d0 commit 1015e8a

File tree

6 files changed

+341
-181
lines changed

6 files changed

+341
-181
lines changed

‎components/engine/api/swagger.yaml‎

Lines changed: 112 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,12 +1874,24 @@ definitions:
18741874
Shared:
18751875
type: "boolean"
18761876
Size:
1877+
description: |
1878+
Amount of disk space used by the build cache (in bytes).
18771879
type: "integer"
18781880
CreatedAt:
1879-
type: "integer"
1881+
description: |
1882+
Date and time at which the build cache was created in
1883+
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
1884+
type: "string"
1885+
format: "dateTime"
1886+
example: "2016-08-18T10:44:24.496525531Z"
18801887
LastUsedAt:
1881-
type: "integer"
1888+
description: |
1889+
Date and time at which the build cache was last used in
1890+
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
1891+
type: "string"
1892+
format: "dateTime"
18821893
x-nullable: true
1894+
example: "2017-08-09T07:09:37.632105588Z"
18831895
UsageCount:
18841896
type: "integer"
18851897

@@ -4105,6 +4117,103 @@ definitions:
41054117
x-nullable: true
41064118
$ref: "#/definitions/Health"
41074119

4120+
SystemVersion:
4121+
type: "object"
4122+
description: |
4123+
Response of Engine API: GET "/version"
4124+
properties:
4125+
Platform:
4126+
type: "object"
4127+
required: [Name]
4128+
properties:
4129+
Name:
4130+
type: "string"
4131+
Components:
4132+
type: "array"
4133+
description: |
4134+
Information about system components
4135+
items:
4136+
type: "object"
4137+
x-go-name: ComponentVersion
4138+
required: [Name, Version]
4139+
properties:
4140+
Name:
4141+
description: |
4142+
Name of the component
4143+
type: "string"
4144+
example: "Engine"
4145+
Version:
4146+
description: |
4147+
Version of the component
4148+
type: "string"
4149+
x-nullable: false
4150+
example: "19.03.12"
4151+
Details:
4152+
description: |
4153+
Key/value pairs of strings with additional information about the
4154+
component. These values are intended for informational purposes
4155+
only, and their content is not defined, and not part of the API
4156+
specification.
4157+
4158+
These messages can be printed by the client as information to the user.
4159+
type: "object"
4160+
x-nullable: true
4161+
Version:
4162+
description: "The version of the daemon"
4163+
type: "string"
4164+
example: "19.03.12"
4165+
ApiVersion:
4166+
description: |
4167+
The default (and highest) API version that is supported by the daemon
4168+
type: "string"
4169+
example: "1.40"
4170+
MinAPIVersion:
4171+
description: |
4172+
The minimum API version that is supported by the daemon
4173+
type: "string"
4174+
example: "1.12"
4175+
GitCommit:
4176+
description: |
4177+
The Git commit of the source code that was used to build the daemon
4178+
type: "string"
4179+
example: "48a66213fe"
4180+
GoVersion:
4181+
description: |
4182+
The version Go used to compile the daemon, and the version of the Go
4183+
runtime in use.
4184+
type: "string"
4185+
example: "go1.13.14"
4186+
Os:
4187+
description: |
4188+
The operating system that the daemon is running on ("linux" or "windows")
4189+
type: "string"
4190+
example: "linux"
4191+
Arch:
4192+
description: |
4193+
The architecture that the daemon is running on
4194+
type: "string"
4195+
example: "amd64"
4196+
KernelVersion:
4197+
description: |
4198+
The kernel version (`uname -r`) that the daemon is running on.
4199+
4200+
This field is omitted when empty.
4201+
type: "string"
4202+
example: "4.19.76-linuxkit"
4203+
Experimental:
4204+
description: |
4205+
Indicates if the daemon is started with experimental features enabled.
4206+
4207+
This field is omitted when empty / false.
4208+
type: "boolean"
4209+
example: true
4210+
BuildTime:
4211+
description: |
4212+
The date and time that the daemon was compiled.
4213+
type: "string"
4214+
example: "2020-06-22T15:49:27.000000000+00:00"
4215+
4216+
41084217
SystemInfo:
41094218
type: "object"
41104219
properties:
@@ -7724,63 +7833,7 @@ paths:
77247833
200:
77257834
description: "no error"
77267835
schema:
7727-
type: "object"
7728-
title: "SystemVersionResponse"
7729-
properties:
7730-
Platform:
7731-
type: "object"
7732-
required: [Name]
7733-
properties:
7734-
Name:
7735-
type: "string"
7736-
Components:
7737-
type: "array"
7738-
items:
7739-
type: "object"
7740-
x-go-name: ComponentVersion
7741-
required: [Name, Version]
7742-
properties:
7743-
Name:
7744-
type: "string"
7745-
Version:
7746-
type: "string"
7747-
x-nullable: false
7748-
Details:
7749-
type: "object"
7750-
x-nullable: true
7751-
7752-
Version:
7753-
type: "string"
7754-
ApiVersion:
7755-
type: "string"
7756-
MinAPIVersion:
7757-
type: "string"
7758-
GitCommit:
7759-
type: "string"
7760-
GoVersion:
7761-
type: "string"
7762-
Os:
7763-
type: "string"
7764-
Arch:
7765-
type: "string"
7766-
KernelVersion:
7767-
type: "string"
7768-
Experimental:
7769-
type: "boolean"
7770-
BuildTime:
7771-
type: "string"
7772-
examples:
7773-
application/json:
7774-
Version: "17.04.0"
7775-
Os: "linux"
7776-
KernelVersion: "3.19.0-23-generic"
7777-
GoVersion: "go1.7.5"
7778-
GitCommit: "deadbee"
7779-
Arch: "amd64"
7780-
ApiVersion: "1.27"
7781-
MinAPIVersion: "1.12"
7782-
BuildTime: "2016-06-14T07:09:13.444803460+00:00"
7783-
Experimental: true
7836+
$ref: "#/definitions/SystemVersion"
77847837
500:
77857838
description: "server error"
77867839
schema:

‎components/engine/docs/api/v1.39.yaml‎

Lines changed: 112 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,12 +1815,24 @@ definitions:
18151815
Shared:
18161816
type: "boolean"
18171817
Size:
1818+
description: |
1819+
Amount of disk space used by the build cache (in bytes).
18181820
type: "integer"
18191821
CreatedAt:
1820-
type: "integer"
1822+
description: |
1823+
Date and time at which the build cache was created in
1824+
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
1825+
type: "string"
1826+
format: "dateTime"
1827+
example: "2016-08-18T10:44:24.496525531Z"
18211828
LastUsedAt:
1822-
type: "integer"
1829+
description: |
1830+
Date and time at which the build cache was last used in
1831+
[RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format with nano-seconds.
1832+
type: "string"
1833+
format: "dateTime"
18231834
x-nullable: true
1835+
example: "2017-08-09T07:09:37.632105588Z"
18241836
UsageCount:
18251837
type: "integer"
18261838

@@ -3987,6 +3999,103 @@ definitions:
39873999
x-nullable: true
39884000
$ref: "#/definitions/Health"
39894001

4002+
SystemVersion:
4003+
type: "object"
4004+
description: |
4005+
Response of Engine API: GET "/version"
4006+
properties:
4007+
Platform:
4008+
type: "object"
4009+
required: [Name]
4010+
properties:
4011+
Name:
4012+
type: "string"
4013+
Components:
4014+
type: "array"
4015+
description: |
4016+
Information about system components
4017+
items:
4018+
type: "object"
4019+
x-go-name: ComponentVersion
4020+
required: [Name, Version]
4021+
properties:
4022+
Name:
4023+
description: |
4024+
Name of the component
4025+
type: "string"
4026+
example: "Engine"
4027+
Version:
4028+
description: |
4029+
Version of the component
4030+
type: "string"
4031+
x-nullable: false
4032+
example: "19.03.12"
4033+
Details:
4034+
description: |
4035+
Key/value pairs of strings with additional information about the
4036+
component. These values are intended for informational purposes
4037+
only, and their content is not defined, and not part of the API
4038+
specification.
4039+
4040+
These messages can be printed by the client as information to the user.
4041+
type: "object"
4042+
x-nullable: true
4043+
Version:
4044+
description: "The version of the daemon"
4045+
type: "string"
4046+
example: "19.03.12"
4047+
ApiVersion:
4048+
description: |
4049+
The default (and highest) API version that is supported by the daemon
4050+
type: "string"
4051+
example: "1.40"
4052+
MinAPIVersion:
4053+
description: |
4054+
The minimum API version that is supported by the daemon
4055+
type: "string"
4056+
example: "1.12"
4057+
GitCommit:
4058+
description: |
4059+
The Git commit of the source code that was used to build the daemon
4060+
type: "string"
4061+
example: "48a66213fe"
4062+
GoVersion:
4063+
description: |
4064+
The version Go used to compile the daemon, and the version of the Go
4065+
runtime in use.
4066+
type: "string"
4067+
example: "go1.13.14"
4068+
Os:
4069+
description: |
4070+
The operating system that the daemon is running on ("linux" or "windows")
4071+
type: "string"
4072+
example: "linux"
4073+
Arch:
4074+
description: |
4075+
The architecture that the daemon is running on
4076+
type: "string"
4077+
example: "amd64"
4078+
KernelVersion:
4079+
description: |
4080+
The kernel version (`uname -r`) that the daemon is running on.
4081+
4082+
This field is omitted when empty.
4083+
type: "string"
4084+
example: "4.19.76-linuxkit"
4085+
Experimental:
4086+
description: |
4087+
Indicates if the daemon is started with experimental features enabled.
4088+
4089+
This field is omitted when empty / false.
4090+
type: "boolean"
4091+
example: true
4092+
BuildTime:
4093+
description: |
4094+
The date and time that the daemon was compiled.
4095+
type: "string"
4096+
example: "2020-06-22T15:49:27.000000000+00:00"
4097+
4098+
39904099
SystemInfo:
39914100
type: "object"
39924101
properties:
@@ -7581,63 +7690,7 @@ paths:
75817690
200:
75827691
description: "no error"
75837692
schema:
7584-
type: "object"
7585-
title: "SystemVersionResponse"
7586-
properties:
7587-
Platform:
7588-
type: "object"
7589-
required: [Name]
7590-
properties:
7591-
Name:
7592-
type: "string"
7593-
Components:
7594-
type: "array"
7595-
items:
7596-
type: "object"
7597-
x-go-name: ComponentVersion
7598-
required: [Name, Version]
7599-
properties:
7600-
Name:
7601-
type: "string"
7602-
Version:
7603-
type: "string"
7604-
x-nullable: false
7605-
Details:
7606-
type: "object"
7607-
x-nullable: true
7608-
7609-
Version:
7610-
type: "string"
7611-
ApiVersion:
7612-
type: "string"
7613-
MinAPIVersion:
7614-
type: "string"
7615-
GitCommit:
7616-
type: "string"
7617-
GoVersion:
7618-
type: "string"
7619-
Os:
7620-
type: "string"
7621-
Arch:
7622-
type: "string"
7623-
KernelVersion:
7624-
type: "string"
7625-
Experimental:
7626-
type: "boolean"
7627-
BuildTime:
7628-
type: "string"
7629-
examples:
7630-
application/json:
7631-
Version: "17.04.0"
7632-
Os: "linux"
7633-
KernelVersion: "3.19.0-23-generic"
7634-
GoVersion: "go1.7.5"
7635-
GitCommit: "deadbee"
7636-
Arch: "amd64"
7637-
ApiVersion: "1.27"
7638-
MinAPIVersion: "1.12"
7639-
BuildTime: "2016-06-14T07:09:13.444803460+00:00"
7640-
Experimental: true
7693+
$ref: "#/definitions/SystemVersion"
76417694
500:
76427695
description: "server error"
76437696
schema:

0 commit comments

Comments
 (0)