Skip to content

Commit 181a0c6

Browse files
shin-londoncalling
authored andcommitted
Compose 1.15.0 additions (docker#3950)
Signed-off-by: Joffrey F <[email protected]>
1 parent d0f6397 commit 181a0c6

File tree

2 files changed

+40
-4
lines changed

2 files changed

+40
-4
lines changed

compose/compose-file/compose-file-v2.md

+39-4
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,23 @@ those used by other software.
162162
- "com.example.department=Finance"
163163
- "com.example.label-with-empty-value"
164164

165+
#### network
166+
167+
> Added in [version 2.2](compose-versioning.md#version-22) file format
168+
169+
Set the network containers will connect to for the `RUN` instructions during
170+
build.
171+
172+
build:
173+
context: .
174+
network: host
175+
176+
177+
build:
178+
context: .
179+
network: custom_network_1
180+
181+
165182
### cap_add, cap_drop
166183

167184
Add or drop container capabilities.
@@ -793,11 +810,20 @@ Example usage:
793810
### pid
794811

795812
pid: "host"
813+
pid: "container:custom_container_1"
814+
pid: "service:foobar"
815+
816+
If set to one of the following forms: `container:<container_name>`,
817+
`service:<service_name>`, the service will share the PID address space of the
818+
designated container or service.
796819

797-
Sets the PID mode to the host PID mode. This turns on sharing between
798-
container and the host operating system the PID address space. Containers
799-
launched with this flag will be able to access and manipulate other
800-
containers in the bare-metal machine's namespace and vise-versa.
820+
If set to "host", the service's PID mode will be the host PID mode. This turns
821+
on sharing between container and the host operating system the PID address
822+
space. Containers launched with this flag will be able to access and manipulate
823+
other containers in the bare-metal machine's namespace and vise-versa.
824+
825+
> **Note**: the `service:` and `container:` forms require
826+
> [version 2.1](compose-versioning.md#version-21) or above
801827
802828
### pids_limit
803829

@@ -857,6 +883,15 @@ SIGTERM. Setting an alternative signal using `stop_signal` will cause
857883

858884
stop_signal: SIGUSR1
859885

886+
### storage_opt
887+
888+
> [Added in version 2.1 file format](compose-versioning.md#version-21).
889+
890+
Set storage driver options for this service.
891+
892+
storage_opt:
893+
size: '1G'
894+
860895
### sysctls
861896

862897
> [Added in version 2.1 file format](compose-versioning.md#version-21).

compose/reference/pull.md

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Usage: pull [options] [SERVICE...]
1111
Options:
1212
--ignore-pull-failures Pull what it can and ignores images with pull failures.
1313
--parallel Pull multiple images in parallel.
14+
--quiet Pull without printing progress information
1415
```
1516

1617
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.

0 commit comments

Comments
 (0)