tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2196 from md2perpe/patch-1

Browse Source 
Remove incorrectly placed comment
This commit is contained in:
mnowster 2015-10-15 15:31:49 +01:00
commit 4d8b184b14
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/compose-file.md
View File

@ -48,8 +48,6 @@ See `man 7 capabilities` for a full list.
- NET_ADMIN - NET_ADMIN
- SYS_ADMIN - SYS_ADMIN
Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
### command ### command
Override the default command. Override the default command.
@ -106,6 +104,8 @@ Compose will use an alternate file to build with.
dockerfile: Dockerfile-alternate dockerfile: Dockerfile-alternate
Using `dockerfile` together with `image` is not allowed. Attempting to do so results in an error.
### env_file ### env_file
Add environment variables from a file. Can be a single value or a list. Add environment variables from a file. Can be a single value or a list.