Browse code
SecurityOpt parameter is singular, and belongs in HostConfig since API 1.17
Signed-off-by: Joffrey F <joffrey@docker.com>
Joffrey F authored on 2015/03/26 08:25:13Showing 2 changed files
- docs/sources/reference/api/docker_remote_api_v1.17.md
- docs/sources/reference/api/docker_remote_api_v1.18.md
| ... | ... |
@@ -138,7 +138,6 @@ Create a container |
| 138 | 138 |
"ExposedPorts": {
|
| 139 | 139 |
"22/tcp": {}
|
| 140 | 140 |
}, |
| 141 |
- "SecurityOpts": [""], |
|
| 142 | 141 |
"HostConfig": {
|
| 143 | 142 |
"Binds": ["/tmp:/tmp"], |
| 144 | 143 |
"Links": ["redis3:redis"], |
| ... | ... |
@@ -156,6 +155,7 @@ Create a container |
| 156 | 156 |
"RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
|
| 157 | 157 |
"NetworkMode": "bridge", |
| 158 | 158 |
"Devices": [] |
| 159 |
+ "SecurityOpt": [""], |
|
| 159 | 160 |
} |
| 160 | 161 |
} |
| 161 | 162 |
|
| ... | ... |
@@ -201,8 +201,6 @@ Json Parameters: |
| 201 | 201 |
container |
| 202 | 202 |
- **ExposedPorts** - An object mapping ports to an empty object in the form of: |
| 203 | 203 |
`"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
|
| 204 |
-- **SecurityOpts**: A list of string values to customize labels for MLS |
|
| 205 |
- systems, such as SELinux. |
|
| 206 | 204 |
- **HostConfig** |
| 207 | 205 |
- **Binds** – A list of volume bindings for this container. Each volume |
| 208 | 206 |
binding is a string of the form `container_path` (to create a new |
| ... | ... |
@@ -244,6 +242,8 @@ Json Parameters: |
| 244 | 244 |
- **Devices** - A list of devices to add to the container specified in the |
| 245 | 245 |
form |
| 246 | 246 |
`{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
|
| 247 |
+ - **SecurityOpt**: A list of string values to customize labels for MLS |
|
| 248 |
+ systems, such as SELinux. |
|
| 247 | 249 |
|
| 248 | 250 |
Query Parameters: |
| 249 | 251 |
|
| ... | ... |
@@ -139,7 +139,6 @@ Create a container |
| 139 | 139 |
"ExposedPorts": {
|
| 140 | 140 |
"22/tcp": {}
|
| 141 | 141 |
}, |
| 142 |
- "SecurityOpts": [""], |
|
| 143 | 142 |
"HostConfig": {
|
| 144 | 143 |
"Binds": ["/tmp:/tmp"], |
| 145 | 144 |
"Links": ["redis3:redis"], |
| ... | ... |
@@ -163,6 +162,7 @@ Create a container |
| 163 | 163 |
"Devices": [], |
| 164 | 164 |
"Ulimits": [{}],
|
| 165 | 165 |
"LogConfig": { "Type": "json-file", Config: {} },
|
| 166 |
+ "SecurityOpt": [""], |
|
| 166 | 167 |
"CgroupParent": "" |
| 167 | 168 |
} |
| 168 | 169 |
} |
| ... | ... |
@@ -211,8 +211,6 @@ Json Parameters: |
| 211 | 211 |
container |
| 212 | 212 |
- **ExposedPorts** - An object mapping ports to an empty object in the form of: |
| 213 | 213 |
`"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
|
| 214 |
-- **SecurityOpts**: A list of string values to customize labels for MLS |
|
| 215 |
- systems, such as SELinux. |
|
| 216 | 214 |
- **HostConfig** |
| 217 | 215 |
- **Binds** – A list of volume bindings for this container. Each volume |
| 218 | 216 |
binding is a string of the form `container_path` (to create a new |
| ... | ... |
@@ -257,6 +255,8 @@ Json Parameters: |
| 257 | 257 |
- **Ulimits** - A list of ulimits to be set in the container, specified as |
| 258 | 258 |
`{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
|
| 259 | 259 |
`Ulimits: { "Name": "nofile", "Soft": 1024, "Hard", 2048 }}`
|
| 260 |
+ - **SecurityOpt**: A list of string values to customize labels for MLS |
|
| 261 |
+ systems, such as SELinux. |
|
| 260 | 262 |
- **LogConfig** - Logging configuration to container, format |
| 261 | 263 |
`{ "Type": "<driver_name>", "Config": {"key1": "val1"}}
|
| 262 | 264 |
Available types: `json-file`, `syslog`, `none`. |