Compose 1.15.0 additions (#3950)

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-07-24 15:23:07 -07:00 committed by Victoria Bialas
parent d0f6397a9e
commit 181a0c6346
2 changed files with 40 additions and 4 deletions

View File

@ -162,6 +162,23 @@ those used by other software.
- "com.example.department=Finance"
- "com.example.label-with-empty-value"
#### network
> Added in [version 2.2](compose-versioning.md#version-22) file format
Set the network containers will connect to for the `RUN` instructions during
build.
build:
context: .
network: host
build:
context: .
network: custom_network_1
### cap_add, cap_drop
Add or drop container capabilities.
@ -793,11 +810,20 @@ Example usage:
### pid
pid: "host"
pid: "container:custom_container_1"
pid: "service:foobar"
Sets the PID mode to the host PID mode. This turns on sharing between
container and the host operating system the PID address space. Containers
launched with this flag will be able to access and manipulate other
containers in the bare-metal machine's namespace and vise-versa.
If set to one of the following forms: `container:<container_name>`,
`service:<service_name>`, the service will share the PID address space of the
designated container or service.
If set to "host", the service's PID mode will be the host PID mode. This turns
on sharing between container and the host operating system the PID address
space. Containers launched with this flag will be able to access and manipulate
other containers in the bare-metal machine's namespace and vise-versa.
> **Note**: the `service:` and `container:` forms require
> [version 2.1](compose-versioning.md#version-21) or above
### pids_limit
@ -857,6 +883,15 @@ SIGTERM. Setting an alternative signal using `stop_signal` will cause
stop_signal: SIGUSR1
### storage_opt
> [Added in version 2.1 file format](compose-versioning.md#version-21).
Set storage driver options for this service.
storage_opt:
size: '1G'
### sysctls
> [Added in version 2.1 file format](compose-versioning.md#version-21).

View File

@ -11,6 +11,7 @@ Usage: pull [options] [SERVICE...]
Options:
--ignore-pull-failures Pull what it can and ignores images with pull failures.
--parallel Pull multiple images in parallel.
--quiet Pull without printing progress information
```
Pulls an image associated with a service defined in a `docker-compose.yml` or `docker-stack.yml` file, but does not start containers based on those images.