tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review 

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-10-16 16:47:13 +02:00
parent 6a4d14e03d
commit 869a0b8dd8
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/aci-compose-features.md
View File

@ -85,8 +85,7 @@ __Legend:__
## Logs ## Logs
Container logs can be obtained for each container with `docker logs <CONTAINER>`. Container logs can be obtained for each container with `docker logs <CONTAINER>`.
The Docker ACI integration does not currently support aggregated logs for containers in a Compose application, The Docker ACI integration does not currently support aggregated logs for containers in a Compose application, see https://github.com/docker/compose-cli/issues/803.
due to ACI not providing either aggregated logs for a container group, or log timestamps that can be easily used to reorder logs properly for display.
## Exposing ports ## Exposing ports

18
docs/aci-container-features.md
View File

@ -17,18 +17,18 @@ __Legend:__
| Flag |Map| Notes | Flag |Map| Notes
|-----------------------|---|---------------------------------| |-----------------------|---|---------------------------------|
| --cpus | ✓ | See [Container Resources](#container-resources) | --cpus | ✓ | See [Container Resources](#container-resources).
| -d, --detach | ✓ | Detach from container logs when container starts. By default, the command line stays attached and follow container logs | -d, --detach | ✓ | Detach from container logs when container starts. By default, the command line stays attached and follow container logs.
| --domainname | ✓ | See [Exposing ports](#exposing-ports) | --domainname | ✓ | See [Exposing ports](#exposing-ports).
| --e, --env | ✓ | Sets environment variable | --e, --env | ✓ | Sets environment variable.
| --envFile | ✓ | Sets environment variable from and external file | --envFile | ✓ | Sets environment variable from and external file.
| -l, --label | x | Unsupported in Docker ACI integration, due to limitations of ACI Tags | -l, --label | x | Unsupported in Docker ACI integration, due to limitations of ACI Tags.
| -m, --memory | ✓ | See [Container Resources](#container-resources) | -m, --memory | ✓ | See [Container Resources](#container-resources).
| --name | ✓ | Provide a name for the container. Name must be unique withing the ACI resource group. a name is generated by default. | --name | ✓ | Provide a name for the container. Name must be unique withing the ACI resource group. a name is generated by default.
| -p, --publish | ✓ | See [Exposing ports](#exposing-ports). Only symetrical port mapping is supported in ACI. | -p, --publish | ✓ | See [Exposing ports](#exposing-ports). Only symetrical port mapping is supported in ACI.
| --restart | ✓ | Restart policy, must be one of: `any`, `none`, `on-failure`. | --restart | ✓ | Restart policy, must be one of: `any`, `none`, `on-failure`.
| --rm | x | Not supported as [ACI does not support auto-delete containers](https://feedback.azure.com/forums/602224-azure-container-instances/suggestions/34066633-support-auto-delete-of-aci-when-container-exits-no) | --rm | x | Not supported as [ACI does not support auto-delete containers](https://feedback.azure.com/forums/602224-azure-container-instances/suggestions/34066633-support-auto-delete-of-aci-when-container-exits-no).
| -v, --volume | ✓ | See [Persistent Volumes](#persistent-volumes) | -v, --volume | ✓ | See [Persistent Volumes](#persistent-volumes).
## Exposing ports ## Exposing ports