From 61dba98608446f10b516a677753877cc3160173f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 25 Mar 2015 16:25:13 -0700
Subject: [PATCH] SecurityOpt parameter is singular, and belongs in HostConfig
since API 1.17
Signed-off-by: Joffrey F <joffrey@docker.com>
---
docs/sources/reference/api/docker_remote_api_v1.17.md | 6 +++---
docs/sources/reference/api/docker_remote_api_v1.18.md | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/sources/reference/api/docker_remote_api_v1.17.md b/docs/sources/reference/api/docker_remote_api_v1.17.md
index 96887559c2..c8b1571697 100644
--- a/docs/sources/reference/api/docker_remote_api_v1.17.md
+++ b/docs/sources/reference/api/docker_remote_api_v1.17.md
@@ -138,7 +138,6 @@ Create a container
"ExposedPorts": {
"22/tcp": {}
},
- "SecurityOpts": [""],
"HostConfig": {
"Binds": ["/tmp:/tmp"],
"Links": ["redis3:redis"],
@@ -156,6 +155,7 @@ Create a container
"RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
"NetworkMode": "bridge",
"Devices": []
+ "SecurityOpt": [""],
}
}
@@ -201,8 +201,6 @@ Json Parameters:
container
- **ExposedPorts** - An object mapping ports to an empty object in the form of:
`"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
-- **SecurityOpts**: A list of string values to customize labels for MLS
- systems, such as SELinux.
- **HostConfig**
- **Binds** – A list of volume bindings for this container. Each volume
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
form
`{ "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:
diff --git a/docs/sources/reference/api/docker_remote_api_v1.18.md b/docs/sources/reference/api/docker_remote_api_v1.18.md
index 2197066d16..321be87e33 100644
--- a/docs/sources/reference/api/docker_remote_api_v1.18.md
+++ b/docs/sources/reference/api/docker_remote_api_v1.18.md
@@ -139,7 +139,6 @@ Create a container
"ExposedPorts": {
"22/tcp": {}
},
- "SecurityOpts": [""],
"HostConfig": {
"Binds": ["/tmp:/tmp"],
"Links": ["redis3:redis"],
@@ -163,6 +162,7 @@ Create a container
"Devices": [],
"Ulimits": [{}],
"LogConfig": { "Type": "json-file", Config: {} },
+ "SecurityOpt": [""],
"CgroupParent": ""
}
}
@@ -211,8 +211,6 @@ Json Parameters:
container
- **ExposedPorts** - An object mapping ports to an empty object in the form of:
`"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
-- **SecurityOpts**: A list of string values to customize labels for MLS
- systems, such as SELinux.
- **HostConfig**
- **Binds** – A list of volume bindings for this container. Each volume
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
`{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
`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
`{ "Type": "<driver_name>", "Config": {"key1": "val1"}}
Available types: `json-file`, `syslog`, `none`.