Преглед изворни кода

Merge pull request #2196 from md2perpe/patch-1

Remove incorrectly placed comment
mnowster пре 10 година
родитељ
комит
4d8b184b14
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      docs/compose-file.md

+ 2 - 2
docs/compose-file.md

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