kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

SecurityOpt parameter is singular, and belongs in HostConfig

Browse source 
since API 1.17

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2015-03-25 16:25:13 -07:00
parent 89e7f5e661
commit 61dba98608
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/sources/reference/api/docker_remote_api_v1.17.md
View file

@ -138,7 +138,6 @@ Create a container
"ExposedPorts": { "ExposedPorts": {
"22/tcp": {} "22/tcp": {}
}, },
"SecurityOpts": [""],
"HostConfig": { "HostConfig": {
"Binds": ["/tmp:/tmp"], "Binds": ["/tmp:/tmp"],
"Links": ["redis3:redis"], "Links": ["redis3:redis"],
@ -156,6 +155,7 @@ Create a container
"RestartPolicy": { "Name": "", "MaximumRetryCount": 0 }, "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
"NetworkMode": "bridge", "NetworkMode": "bridge",
"Devices": [] "Devices": []
"SecurityOpt": [""],
} }
} }
@ -201,8 +201,6 @@ Json Parameters:
container container
- **ExposedPorts** - An object mapping ports to an empty object in the form of: - **ExposedPorts** - An object mapping ports to an empty object in the form of:
`"ExposedPorts": { "<port>/<tcp|udp>: {}" }` `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
- **SecurityOpts**: A list of string values to customize labels for MLS
systems, such as SELinux.
- **HostConfig** - **HostConfig**
- **Binds** – A list of volume bindings for this container. Each volume - **Binds** – A list of volume bindings for this container. Each volume
binding is a string of the form `container_path` (to create a new binding is a string of the form `container_path` (to create a new
@ -244,6 +242,8 @@ Json Parameters:
- **Devices** - A list of devices to add to the container specified in the - **Devices** - A list of devices to add to the container specified in the
form form
`{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}` `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
- **SecurityOpt**: A list of string values to customize labels for MLS
systems, such as SELinux.
Query Parameters: Query Parameters:

6
docs/sources/reference/api/docker_remote_api_v1.18.md
View file

@ -139,7 +139,6 @@ Create a container
"ExposedPorts": { "ExposedPorts": {
"22/tcp": {} "22/tcp": {}
}, },
"SecurityOpts": [""],
"HostConfig": { "HostConfig": {
"Binds": ["/tmp:/tmp"], "Binds": ["/tmp:/tmp"],
"Links": ["redis3:redis"], "Links": ["redis3:redis"],
@ -163,6 +162,7 @@ Create a container
"Devices": [], "Devices": [],
"Ulimits": [{}], "Ulimits": [{}],
"LogConfig": { "Type": "json-file", Config: {} }, "LogConfig": { "Type": "json-file", Config: {} },
"SecurityOpt": [""],
"CgroupParent": "" "CgroupParent": ""
} }
} }
@ -211,8 +211,6 @@ Json Parameters:
container container
- **ExposedPorts** - An object mapping ports to an empty object in the form of: - **ExposedPorts** - An object mapping ports to an empty object in the form of:
`"ExposedPorts": { "<port>/<tcp|udp>: {}" }` `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
- **SecurityOpts**: A list of string values to customize labels for MLS
systems, such as SELinux.
- **HostConfig** - **HostConfig**
- **Binds** – A list of volume bindings for this container. Each volume - **Binds** – A list of volume bindings for this container. Each volume
binding is a string of the form `container_path` (to create a new binding is a string of the form `container_path` (to create a new
@ -257,6 +255,8 @@ Json Parameters:
- **Ulimits** - A list of ulimits to be set in the container, specified as - **Ulimits** - A list of ulimits to be set in the container, specified as
`{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example: `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
`Ulimits: { "Name": "nofile", "Soft": 1024, "Hard", 2048 }}` `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard", 2048 }}`
- **SecurityOpt**: A list of string values to customize labels for MLS
systems, such as SELinux.
- **LogConfig** - Logging configuration to container, format - **LogConfig** - Logging configuration to container, format
`{ "Type": "<driver_name>", "Config": {"key1": "val1"}} `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}
Available types: `json-file`, `syslog`, `none`. Available types: `json-file`, `syslog`, `none`.