diff --git a/api/swagger.yaml b/api/swagger.yaml index bada4a8e3c876..b6bca4cef1107 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -5755,7 +5755,6 @@ paths: property1: "string" property2: "string" IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -8607,12 +8606,20 @@ paths: if `tty` was specified as part of creating and starting the exec instance. operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.22.md b/docs/api/v1.22.md index b0f0bc88bba2f..115acdd06bbd4 100644 --- a/docs/api/v1.22.md +++ b/docs/api/v1.22.md @@ -553,7 +553,6 @@ Return low-level information on the container `id` "ExtraHosts": null, "IpcMode": "", "Links": null, - "LxcConf": [], "Memory": 0, "MemorySwap": 0, "MemoryReservation": 0, diff --git a/docs/api/v1.23.md b/docs/api/v1.23.md index f0859fcf814d6..904bdca161478 100644 --- a/docs/api/v1.23.md +++ b/docs/api/v1.23.md @@ -579,7 +579,6 @@ Return low-level information on the container `id` "ExtraHosts": null, "IpcMode": "", "Links": null, - "LxcConf": [], "Memory": 0, "MemorySwap": 0, "MemoryReservation": 0, diff --git a/docs/api/v1.24.md b/docs/api/v1.24.md index 5ee0600c04ea7..dd3e62cbecea3 100644 --- a/docs/api/v1.24.md +++ b/docs/api/v1.24.md @@ -624,7 +624,6 @@ Return low-level information on the container `id` "ExtraHosts": null, "IpcMode": "", "Links": null, - "LxcConf": [], "Memory": 0, "MemorySwap": 0, "MemoryReservation": 0, diff --git a/docs/api/v1.25.yaml b/docs/api/v1.25.yaml index cbcf726ab87e8..10cfaf8a99e70 100644 --- a/docs/api/v1.25.yaml +++ b/docs/api/v1.25.yaml @@ -2975,7 +2975,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -5679,12 +5678,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.26.yaml b/docs/api/v1.26.yaml index 22d4cc4e06530..4e0b0b6f8df4e 100644 --- a/docs/api/v1.26.yaml +++ b/docs/api/v1.26.yaml @@ -2980,7 +2980,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -5688,12 +5687,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.27.yaml b/docs/api/v1.27.yaml index 542251110caf1..b25e214f3c43d 100644 --- a/docs/api/v1.27.yaml +++ b/docs/api/v1.27.yaml @@ -3040,7 +3040,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -5763,12 +5762,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.28.yaml b/docs/api/v1.28.yaml index ed96d079c914b..54da70fbce22a 100644 --- a/docs/api/v1.28.yaml +++ b/docs/api/v1.28.yaml @@ -3130,7 +3130,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -5879,12 +5878,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.29.yaml b/docs/api/v1.29.yaml index 77f6cbea12576..32e83af540da9 100644 --- a/docs/api/v1.29.yaml +++ b/docs/api/v1.29.yaml @@ -3164,7 +3164,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -5913,12 +5912,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.30.yaml b/docs/api/v1.30.yaml index 007564d3529a9..27e37c690fe37 100644 --- a/docs/api/v1.30.yaml +++ b/docs/api/v1.30.yaml @@ -3382,7 +3382,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -6149,12 +6148,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.31.yaml b/docs/api/v1.31.yaml index 77518554fca6c..b2e50e3bd1724 100644 --- a/docs/api/v1.31.yaml +++ b/docs/api/v1.31.yaml @@ -3452,7 +3452,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -6242,12 +6241,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.32.yaml b/docs/api/v1.32.yaml index 8771635713908..8a5ed22da2c30 100644 --- a/docs/api/v1.32.yaml +++ b/docs/api/v1.32.yaml @@ -4691,7 +4691,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7279,12 +7278,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.33.yaml b/docs/api/v1.33.yaml index 28ac5736e3071..36893d7ae1904 100644 --- a/docs/api/v1.33.yaml +++ b/docs/api/v1.33.yaml @@ -4696,7 +4696,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7288,12 +7287,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.34.yaml b/docs/api/v1.34.yaml index 725b1c208090a..4564f3ebed349 100644 --- a/docs/api/v1.34.yaml +++ b/docs/api/v1.34.yaml @@ -4725,7 +4725,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7334,12 +7333,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.35.yaml b/docs/api/v1.35.yaml index 64c586cc89801..91d4367761f05 100644 --- a/docs/api/v1.35.yaml +++ b/docs/api/v1.35.yaml @@ -4707,7 +4707,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7346,12 +7345,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.36.yaml b/docs/api/v1.36.yaml index 788666a9c0b0e..f62d0fb68b907 100644 --- a/docs/api/v1.36.yaml +++ b/docs/api/v1.36.yaml @@ -4723,7 +4723,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7380,12 +7379,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.37.yaml b/docs/api/v1.37.yaml index 2df565ff0b9ac..08942c32cfd34 100644 --- a/docs/api/v1.37.yaml +++ b/docs/api/v1.37.yaml @@ -4743,7 +4743,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7423,12 +7422,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.38.yaml b/docs/api/v1.38.yaml index 27c65ba653e4d..66ff715f02a76 100644 --- a/docs/api/v1.38.yaml +++ b/docs/api/v1.38.yaml @@ -4804,7 +4804,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -7484,12 +7483,20 @@ paths: description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance." operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.39.yaml b/docs/api/v1.39.yaml index 7aafe94108915..1ec7e63ebc1d3 100644 --- a/docs/api/v1.39.yaml +++ b/docs/api/v1.39.yaml @@ -5459,7 +5459,6 @@ paths: CpuRealtimeRuntime: 10000 Devices: [] IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -8249,12 +8248,20 @@ paths: if `tty` was specified as part of creating and starting the exec instance. operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.40.yaml b/docs/api/v1.40.yaml index e6f33451facb4..3534c10809fa5 100644 --- a/docs/api/v1.40.yaml +++ b/docs/api/v1.40.yaml @@ -5760,7 +5760,6 @@ paths: property1: "string" property2: "string" IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -8574,12 +8573,20 @@ paths: if `tty` was specified as part of creating and starting the exec instance. operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/v1.41.yaml b/docs/api/v1.41.yaml index d7a544a7ee689..8bd310d7a2c63 100644 --- a/docs/api/v1.41.yaml +++ b/docs/api/v1.41.yaml @@ -5915,7 +5915,6 @@ paths: property1: "string" property2: "string" IpcMode: "" - LxcConf: [] Memory: 0 MemorySwap: 0 MemoryReservation: 0 @@ -8744,12 +8743,20 @@ paths: if `tty` was specified as part of creating and starting the exec instance. operationId: "ExecResize" responses: - 201: + 200: description: "No error" + 400: + description: "bad parameter" + schema: + $ref: "#/definitions/ErrorResponse" 404: description: "No such exec instance" schema: $ref: "#/definitions/ErrorResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" diff --git a/docs/api/version-history.md b/docs/api/version-history.md index 65d6145276812..f2dc76ce21cdf 100644 --- a/docs/api/version-history.md +++ b/docs/api/version-history.md @@ -32,7 +32,7 @@ keywords: "API, Docker, rcli, REST, documentation" * The `filter` (singular) query parameter, which was deprecated in favor of the `filters` option in Docker 1.13, has now been removed from the `GET /images/json` endpoint. The parameter remains available when using API version 1.40 or below. -* `GET /services` now returns `CappAdd` and `CapDrop` as part of the `ContainerSpec`. +* `GET /services` now returns `CapAdd` and `CapDrop` as part of the `ContainerSpec`. * `GET /services/{id}` now returns `CapAdd` and `CapDrop` as part of the `ContainerSpec`. * `POST /services/create` now accepts `CapAdd` and `CapDrop` as part of the `ContainerSpec`. * `POST /services/{id}/update` now accepts `CapAdd` and `CapDrop` as part of the `ContainerSpec`. @@ -477,6 +477,8 @@ keywords: "API, Docker, rcli, REST, documentation" [Docker Engine API v1.22](v1.22.md) documentation +* The `HostConfig.LxcConf` field has been removed, and is no longer available on + `POST /containers/create` and `GET /containers/(id)/json`. * `POST /container/(name)/update` updates the resources of a container. * `GET /containers/json` supports filter `isolation` on Windows. * `GET /containers/json` now returns the list of networks of containers.