From 05083b690cb1e0b8e4d28fe0d567d8f2e4d69fd3 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Mon, 9 May 2016 10:16:37 +1000 Subject: [PATCH] Merge pull request #3092 from wenchma/service_image Update image format for service conf reference (cherry picked from commit f1603a3ee2b074df4cce61842bfc3dff2af8915e) Signed-off-by: Sven Dowideit --- docs/compose-file.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/compose-file.md b/docs/compose-file.md index 4902e8dd..b55f250a 100644 --- a/docs/compose-file.md +++ b/docs/compose-file.md @@ -59,13 +59,13 @@ optionally [dockerfile](#dockerfile) and [args](#args). args: buildno: 1 -If you specify `image` as well as `build`, then Compose tags the built image -with the tag specified in `image`: +If you specify `image` as well as `build`, then Compose names the built image +with the `webapp` and optional `tag` specified in `image`: build: ./dir - image: webapp + image: webapp:tag -This will result in an image tagged `webapp`, built from `./dir`. +This will result in an image named `webapp` and tagged `tag`, built from `./dir`. > **Note**: In the [version 1 file format](#version-1), `build` is different in > two ways: