compose-file v2: re-order topics to be the same as v3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-03-17 11:01:01 +01:00
parent fad62a6e9d
commit dc2ae46f92
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 36 additions and 35 deletions

View File

@ -143,20 +143,6 @@ image: webapp:tag
This results in an image named `webapp` and tagged `tag`, built from `./dir`.
#### cache_from
> Added in [version 2.2](compose-versioning.md#version-22) file format
A list of images that the engine uses for cache resolution.
```yaml
build:
context: .
cache_from:
- alpine:latest
- corp/web_app:3.14
```
#### context
> [Version 2 file format](compose-versioning.md#version-2) and up. In version 1, just use
@ -242,6 +228,20 @@ args:
> **Note**: YAML boolean values (`true`, `false`, `yes`, `no`, `on`, `off`) must
> be enclosed in quotes, so that the parser interprets them as strings.
#### cache_from
> Added in [version 2.2](compose-versioning.md#version-22) file format
A list of images that the engine uses for cache resolution.
```yaml
build:
context: .
cache_from:
- alpine:latest
- corp/web_app:3.14
```
#### extra_hosts
Add hostname mappings at build-time. Use the same values as the docker client `--add-host` parameter.
@ -367,6 +367,14 @@ cap_drop:
- SYS_ADMIN
```
### cgroup_parent
Specify an optional parent cgroup for the container.
```yaml
cgroup_parent: m-executor-abcd
```
### command
Override the default command.
@ -382,14 +390,6 @@ The command can also be a list, in a manner similar to
command: ["bundle", "exec", "thin", "-p", "3000"]
```
### cgroup_parent
Specify an optional parent cgroup for the container.
```yaml
cgroup_parent: m-executor-abcd
```
### container_name
Specify a custom container name, rather than a generated default name.
@ -548,19 +548,6 @@ dns_search:
- dc2.example.com
```
### tmpfs
Mount a temporary file system inside the container. Can be a single value or a list.
```yaml
tmpfs: /run
```
```yaml
tmpfs:
- /run
- /tmp
```
### entrypoint
Override the default entrypoint.
@ -1359,6 +1346,20 @@ sysctls:
- net.ipv4.tcp_syncookies=0
```
### tmpfs
Mount a temporary file system inside the container. Can be a single value or a list.
```yaml
tmpfs: /run
```
```yaml
tmpfs:
- /run
- /tmp
```
### ulimits
Override the default ulimits for a container. You can either specify a single