Skip to content

Commit b00f4ef

Browse files
committed
Backport some api v1.44 changes
1 parent 7a92b27 commit b00f4ef

23 files changed

+190
-92
lines changed

api-model-v1-41/.openapi-generator/FILES

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ docs/ContainerCreateResponse.md
2727
docs/ContainerInspectResponse.md
2828
docs/ContainerPruneResponse.md
2929
docs/ContainerState.md
30+
docs/ContainerStatus.md
3031
docs/ContainerSummary.md
3132
docs/ContainerSummaryHostConfig.md
3233
docs/ContainerSummaryNetworkSettings.md
@@ -129,6 +130,7 @@ docs/PluginSettings.md
129130
docs/PluginsInfo.md
130131
docs/Port.md
131132
docs/PortBinding.md
133+
docs/PortStatus.md
132134
docs/ProcessConfig.md
133135
docs/ProgressDetail.md
134136
docs/PushImageInfo.md
@@ -208,7 +210,6 @@ docs/TaskSpecResources.md
208210
docs/TaskSpecRestartPolicy.md
209211
docs/TaskState.md
210212
docs/TaskStatus.md
211-
docs/TaskStatusContainerStatus.md
212213
docs/ThrottleDevice.md
213214
docs/UnlockKeyResponse.md
214215
docs/Volume.md
@@ -248,6 +249,7 @@ src/main/kotlin/de/gesellix/docker/remote/api/ContainerCreateResponse.kt
248249
src/main/kotlin/de/gesellix/docker/remote/api/ContainerInspectResponse.kt
249250
src/main/kotlin/de/gesellix/docker/remote/api/ContainerPruneResponse.kt
250251
src/main/kotlin/de/gesellix/docker/remote/api/ContainerState.kt
252+
src/main/kotlin/de/gesellix/docker/remote/api/ContainerStatus.kt
251253
src/main/kotlin/de/gesellix/docker/remote/api/ContainerSummary.kt
252254
src/main/kotlin/de/gesellix/docker/remote/api/ContainerSummaryHostConfig.kt
253255
src/main/kotlin/de/gesellix/docker/remote/api/ContainerSummaryNetworkSettings.kt
@@ -344,6 +346,7 @@ src/main/kotlin/de/gesellix/docker/remote/api/PluginSettings.kt
344346
src/main/kotlin/de/gesellix/docker/remote/api/PluginsInfo.kt
345347
src/main/kotlin/de/gesellix/docker/remote/api/Port.kt
346348
src/main/kotlin/de/gesellix/docker/remote/api/PortBinding.kt
349+
src/main/kotlin/de/gesellix/docker/remote/api/PortStatus.kt
347350
src/main/kotlin/de/gesellix/docker/remote/api/ProcessConfig.kt
348351
src/main/kotlin/de/gesellix/docker/remote/api/ProgressDetail.kt
349352
src/main/kotlin/de/gesellix/docker/remote/api/PushImageInfo.kt
@@ -417,7 +420,6 @@ src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecResources.kt
417420
src/main/kotlin/de/gesellix/docker/remote/api/TaskSpecRestartPolicy.kt
418421
src/main/kotlin/de/gesellix/docker/remote/api/TaskState.kt
419422
src/main/kotlin/de/gesellix/docker/remote/api/TaskStatus.kt
420-
src/main/kotlin/de/gesellix/docker/remote/api/TaskStatusContainerStatus.kt
421423
src/main/kotlin/de/gesellix/docker/remote/api/ThrottleDevice.kt
422424
src/main/kotlin/de/gesellix/docker/remote/api/UnlockKeyResponse.kt
423425
src/main/kotlin/de/gesellix/docker/remote/api/Volume.kt

api-model-v1-41/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ Class | Method | HTTP request | Description
252252
- [de.gesellix.docker.remote.api.ContainerInspectResponse](docs/ContainerInspectResponse.md)
253253
- [de.gesellix.docker.remote.api.ContainerPruneResponse](docs/ContainerPruneResponse.md)
254254
- [de.gesellix.docker.remote.api.ContainerState](docs/ContainerState.md)
255+
- [de.gesellix.docker.remote.api.ContainerStatus](docs/ContainerStatus.md)
255256
- [de.gesellix.docker.remote.api.ContainerSummary](docs/ContainerSummary.md)
256257
- [de.gesellix.docker.remote.api.ContainerSummaryHostConfig](docs/ContainerSummaryHostConfig.md)
257258
- [de.gesellix.docker.remote.api.ContainerSummaryNetworkSettings](docs/ContainerSummaryNetworkSettings.md)
@@ -348,6 +349,7 @@ Class | Method | HTTP request | Description
348349
- [de.gesellix.docker.remote.api.PluginsInfo](docs/PluginsInfo.md)
349350
- [de.gesellix.docker.remote.api.Port](docs/Port.md)
350351
- [de.gesellix.docker.remote.api.PortBinding](docs/PortBinding.md)
352+
- [de.gesellix.docker.remote.api.PortStatus](docs/PortStatus.md)
351353
- [de.gesellix.docker.remote.api.ProcessConfig](docs/ProcessConfig.md)
352354
- [de.gesellix.docker.remote.api.ProgressDetail](docs/ProgressDetail.md)
353355
- [de.gesellix.docker.remote.api.PushImageInfo](docs/PushImageInfo.md)
@@ -421,7 +423,6 @@ Class | Method | HTTP request | Description
421423
- [de.gesellix.docker.remote.api.TaskSpecRestartPolicy](docs/TaskSpecRestartPolicy.md)
422424
- [de.gesellix.docker.remote.api.TaskState](docs/TaskState.md)
423425
- [de.gesellix.docker.remote.api.TaskStatus](docs/TaskStatus.md)
424-
- [de.gesellix.docker.remote.api.TaskStatusContainerStatus](docs/TaskStatusContainerStatus.md)
425426
- [de.gesellix.docker.remote.api.ThrottleDevice](docs/ThrottleDevice.md)
426427
- [de.gesellix.docker.remote.api.UnlockKeyResponse](docs/UnlockKeyResponse.md)
427428
- [de.gesellix.docker.remote.api.Volume](docs/Volume.md)

api-model-v1-41/docker-engine-api-v1.41.yaml

Lines changed: 113 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,10 @@ definitions:
13001300
type: "boolean"
13011301
# x-nullable: true
13021302
MacAddress:
1303-
description: "MAC address of the container."
1303+
description: |
1304+
MAC address of the container.
1305+
1306+
Deprecated: this field is deprecated in API v1.44 and up. Use EndpointSettings.MacAddress instead.
13041307
type: "string"
13051308
# x-nullable: true
13061309
OnBuild:
@@ -1369,6 +1372,7 @@ definitions:
13691372
LinkLocalIPs:
13701373
- "169.254.34.68"
13711374
- "fe80::3468"
1375+
MacAddress: "02:42:ac:12:05:02"
13721376
Links:
13731377
- "container_1"
13741378
- "container_2"
@@ -1730,10 +1734,16 @@ definitions:
17301734
The ID of the container that was used to create the image.
17311735
17321736
Depending on how the image was created, this field may be empty.
1737+
1738+
**Deprecated**: this field is kept for backward compatibility, but
1739+
will be removed in API v1.45.
17331740
type: "string"
17341741
x-nullable: false
17351742
example: "65974bc86f1770ae4bff79f651ebdbce166ae9aada632ee3fa9af3a264911735"
17361743
ContainerConfig:
1744+
description: |
1745+
**Deprecated**: this field is kept for backward compatibility, but
1746+
will be removed in API v1.45.
17371747
$ref: "#/definitions/ContainerConfig"
17381748
DockerVersion:
17391749
description: |
@@ -2448,6 +2458,11 @@ definitions:
24482458
example:
24492459
- "container_1"
24502460
- "container_2"
2461+
MacAddress:
2462+
description: |
2463+
MAC address for the endpoint on this network. The network driver might ignore this parameter.
2464+
type: "string"
2465+
example: "02:42:ac:11:00:04"
24512466
Aliases:
24522467
type: "array"
24532468
items:
@@ -2498,11 +2513,6 @@ definitions:
24982513
type: "integer"
24992514
format: "int64"
25002515
example: 64
2501-
MacAddress:
2502-
description: |
2503-
MAC address for the endpoint on this network.
2504-
type: "string"
2505-
example: "02:42:ac:11:00:04"
25062516
DriverOpts:
25072517
description: |
25082518
DriverOpts is a mapping of driver options and values. These options
@@ -3942,6 +3952,44 @@ definitions:
39423952
- "remove"
39433953
- "orphaned"
39443954

3955+
ContainerStatus:
3956+
type: "object"
3957+
description: "represents the status of a container."
3958+
properties:
3959+
ContainerID:
3960+
type: "string"
3961+
PID:
3962+
type: "integer"
3963+
ExitCode:
3964+
type: "integer"
3965+
3966+
PortStatus:
3967+
type: "object"
3968+
description: "represents the port status of a task's host ports whose service has published host ports"
3969+
properties:
3970+
Ports:
3971+
type: "array"
3972+
items:
3973+
$ref: "#/definitions/EndpointPortConfig"
3974+
3975+
TaskStatus:
3976+
type: "object"
3977+
description: "represents the status of a task."
3978+
properties:
3979+
Timestamp:
3980+
type: "string"
3981+
format: "dateTime"
3982+
State:
3983+
$ref: "#/definitions/TaskState"
3984+
Message:
3985+
type: "string"
3986+
Err:
3987+
type: "string"
3988+
ContainerStatus:
3989+
$ref: "#/definitions/ContainerStatus"
3990+
PortStatus:
3991+
$ref: "#/definitions/PortStatus"
3992+
39453993
Task:
39463994
type: "object"
39473995
properties:
@@ -3977,26 +4025,7 @@ definitions:
39774025
AssignedGenericResources:
39784026
$ref: "#/definitions/GenericResources"
39794027
Status:
3980-
type: "object"
3981-
properties:
3982-
Timestamp:
3983-
type: "string"
3984-
format: "dateTime"
3985-
State:
3986-
$ref: "#/definitions/TaskState"
3987-
Message:
3988-
type: "string"
3989-
Err:
3990-
type: "string"
3991-
ContainerStatus:
3992-
type: "object"
3993-
properties:
3994-
ContainerID:
3995-
type: "string"
3996-
PID:
3997-
type: "integer"
3998-
ExitCode:
3999-
type: "integer"
4028+
$ref: "#/definitions/TaskStatus"
40004029
DesiredState:
40014030
$ref: "#/definitions/TaskState"
40024031
JobIteration:
@@ -4212,7 +4241,10 @@ definitions:
42124241
- "stop-first"
42134242
- "start-first"
42144243
Networks:
4215-
description: "Specifies which networks the service should attach to."
4244+
description: |
4245+
Specifies which networks the service should attach to.
4246+
4247+
Deprecated: This field is deprecated since v1.44. The Networks field in TaskSpec should be used instead.
42164248
type: "array"
42174249
items:
42184250
$ref: "#/definitions/NetworkAttachmentConfig"
@@ -4454,6 +4486,37 @@ definitions:
44544486
description: "The image ID of an image that was deleted"
44554487
type: "string"
44564488

4489+
ServiceCreateResponse:
4490+
type: "object"
4491+
description: |
4492+
contains the information returned to a client on the
4493+
creation of a new service.
4494+
properties:
4495+
ID:
4496+
description: "The ID of the created service."
4497+
type: "string"
4498+
x-nullable: false
4499+
example: "ak7w3gjqoa3kuz8xcpnyy0pvl"
4500+
Warning:
4501+
description: |
4502+
Optional warning message.
4503+
4504+
deprecated: this is only kept for backwards compatibility and will be removed.
4505+
type: "string"
4506+
x-nullable: true
4507+
example: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
4508+
Warnings:
4509+
description: |
4510+
Optional warning message.
4511+
4512+
FIXME(thaJeztah): this should have "omitempty" in the generated type.
4513+
type: "array"
4514+
x-nullable: true
4515+
items:
4516+
type: "string"
4517+
example:
4518+
- "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
4519+
44574520
ServiceUpdateResponse:
44584521
type: "object"
44594522
properties:
@@ -4463,7 +4526,8 @@ definitions:
44634526
items:
44644527
type: "string"
44654528
example:
4466-
Warning: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
4529+
Warnings:
4530+
- "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
44674531

44684532
ContainerSummary:
44694533
type: "object"
@@ -5734,22 +5798,22 @@ definitions:
57345798
type: "integer"
57355799
format: "int64"
57365800
example: 3987495
5737-
# TODO Not yet including these fields for now, as they are nil / omitted in our response.
5738-
# urls:
5739-
# description: |
5740-
# List of URLs from which this object MAY be downloaded.
5741-
# type: "array"
5742-
# items:
5743-
# type: "string"
5744-
# format: "uri"
5745-
# annotations:
5746-
# description: |
5747-
# Arbitrary metadata relating to the targeted content.
5748-
# type: "object"
5749-
# additionalProperties:
5750-
# type: "string"
5751-
# platform:
5752-
# $ref: "#/definitions/OCIPlatform"
5801+
# TODO Not yet including these fields for now, as they are nil / omitted in our response.
5802+
# urls:
5803+
# description: |
5804+
# List of URLs from which this object MAY be downloaded.
5805+
# type: "array"
5806+
# items:
5807+
# type: "string"
5808+
# format: "uri"
5809+
# annotations:
5810+
# description: |
5811+
# Arbitrary metadata relating to the targeted content.
5812+
# type: "object"
5813+
# additionalProperties:
5814+
# type: "string"
5815+
# platform:
5816+
# $ref: "#/definitions/OCIPlatform"
57535817

57545818
OCIPlatform:
57555819
type: "object"
@@ -8001,6 +8065,7 @@ paths:
80018065
- `label=key` or `label="key=value"` of an image label
80028066
- `reference`=(`<image-name>[:<tag>]`)
80038067
- `since`=(`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`)
8068+
- `until=<timestamp>`
80048069
type: "string"
80058070
- name: "shared-size"
80068071
in: "query"
@@ -10017,6 +10082,7 @@ paths:
1001710082
/networks/{id}/connect:
1001810083
post:
1001910084
summary: "Connect a container to a network"
10085+
description: "The network must be either a local-scoped network or a swarm-scoped network with the `attachable` option set. A network cannot be re-attached to a running container"
1002010086
operationId: "NetworkConnect"
1002110087
consumes:
1002210088
- "application/json"
@@ -10028,7 +10094,7 @@ paths:
1002810094
schema:
1002910095
$ref: "#/definitions/ErrorResponse"
1003010096
403:
10031-
description: "Operation not supported for swarm scoped networks"
10097+
description: "Operation forbidden or not supported for swarm scoped networks"
1003210098
schema:
1003310099
$ref: "#/definitions/ErrorResponse"
1003410100
404:
@@ -10063,6 +10129,7 @@ paths:
1006310129
IPAMConfig:
1006410130
IPv4Address: "172.24.56.89"
1006510131
IPv6Address: "2001:db8::5689"
10132+
MacAddress: "02:42:ac:12:05:02"
1006610133
tags: ["Network"]
1006710134

1006810135
/networks/{id}/disconnect:
@@ -11056,18 +11123,7 @@ paths:
1105611123
201:
1105711124
description: "no error"
1105811125
schema:
11059-
type: "object"
11060-
title: "ServiceCreateResponse"
11061-
properties:
11062-
ID:
11063-
description: "The ID of the created service."
11064-
type: "string"
11065-
Warning:
11066-
description: "Optional warning message"
11067-
type: "string"
11068-
example:
11069-
ID: "ak7w3gjqoa3kuz8xcpnyy0pvl"
11070-
Warning: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
11126+
$ref: "#/definitions/ServiceCreateResponse"
1107111127
400:
1107211128
description: "bad parameter"
1107311129
schema:

api-model-v1-41/docs/ContainerConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Name | Type | Description | Notes
2323
**workingDir** | **kotlin.String** | The working directory for commands to run in. | [optional]
2424
**entrypoint** | **kotlin.collections.MutableList&lt;kotlin.String&gt;** | The entry point for the container as a string or an array of strings. If the array consists of exactly one empty string (&#x60;[\&quot;\&quot;]&#x60;) then the entry point is reset to system default (i.e., the entry point used by docker when there is no &#x60;ENTRYPOINT&#x60; instruction in the &#x60;Dockerfile&#x60;). | [optional]
2525
**networkDisabled** | **kotlin.Boolean** | Disable networking for the container. | [optional]
26-
**macAddress** | **kotlin.String** | MAC address of the container. | [optional]
26+
**macAddress** | **kotlin.String** | MAC address of the container. Deprecated: this field is deprecated in API v1.44 and up. Use EndpointSettings.MacAddress instead. | [optional]
2727
**onBuild** | **kotlin.collections.MutableList&lt;kotlin.String&gt;** | &#x60;ONBUILD&#x60; metadata that were defined in the image&#39;s &#x60;Dockerfile&#x60;. | [optional]
2828
**labels** | **kotlin.collections.MutableMap&lt;kotlin.String, kotlin.String&gt;** | User-defined key/value metadata. | [optional]
2929
**stopSignal** | **kotlin.String** | Signal to stop a container as a string or unsigned integer. | [optional]

api-model-v1-41/docs/ContainerCreateRequest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Name | Type | Description | Notes
2323
**workingDir** | **kotlin.String** | The working directory for commands to run in. | [optional]
2424
**entrypoint** | **kotlin.collections.MutableList&lt;kotlin.String&gt;** | The entry point for the container as a string or an array of strings. If the array consists of exactly one empty string (&#x60;[\&quot;\&quot;]&#x60;) then the entry point is reset to system default (i.e., the entry point used by docker when there is no &#x60;ENTRYPOINT&#x60; instruction in the &#x60;Dockerfile&#x60;). | [optional]
2525
**networkDisabled** | **kotlin.Boolean** | Disable networking for the container. | [optional]
26-
**macAddress** | **kotlin.String** | MAC address of the container. | [optional]
26+
**macAddress** | **kotlin.String** | MAC address of the container. Deprecated: this field is deprecated in API v1.44 and up. Use EndpointSettings.MacAddress instead. | [optional]
2727
**onBuild** | **kotlin.collections.MutableList&lt;kotlin.String&gt;** | &#x60;ONBUILD&#x60; metadata that were defined in the image&#39;s &#x60;Dockerfile&#x60;. | [optional]
2828
**labels** | **kotlin.collections.MutableMap&lt;kotlin.String, kotlin.String&gt;** | User-defined key/value metadata. | [optional]
2929
**stopSignal** | **kotlin.String** | Signal to stop a container as a string or unsigned integer. | [optional]

api-model-v1-41/docs/EndpointSettings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
77
**ipAMConfig** | [**EndpointIPAMConfig**](EndpointIPAMConfig.md) | | [optional]
88
**links** | **kotlin.collections.MutableList&lt;kotlin.String&gt;** | | [optional]
9+
**macAddress** | **kotlin.String** | MAC address for the endpoint on this network. The network driver might ignore this parameter. | [optional]
910
**aliases** | **kotlin.collections.MutableList&lt;kotlin.String&gt;** | | [optional]
1011
**networkID** | **kotlin.String** | Unique ID of the network. | [optional]
1112
**endpointID** | **kotlin.String** | Unique ID for the service endpoint in a Sandbox. | [optional]
@@ -15,7 +16,6 @@ Name | Type | Description | Notes
1516
**ipv6Gateway** | **kotlin.String** | IPv6 gateway address. | [optional]
1617
**globalIPv6Address** | **kotlin.String** | Global IPv6 address. | [optional]
1718
**globalIPv6PrefixLen** | **kotlin.Long** | Mask length of the global IPv6 address. | [optional]
18-
**macAddress** | **kotlin.String** | MAC address for the endpoint on this network. | [optional]
1919
**driverOpts** | **kotlin.collections.MutableMap&lt;kotlin.String, kotlin.String&gt;** | DriverOpts is a mapping of driver options and values. These options are passed directly to the driver and are driver specific. | [optional]
2020

2121

0 commit comments

Comments
 (0)