Merge pull request #5992 from rickard-von-essen/docker-docs

builder/docker: Small doc update
This commit is contained in:
Megan Marsh 2018-03-08 08:16:39 -08:00 committed by GitHub
commit 74ba7f08f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions

View File

@ -24,9 +24,11 @@ has a simple mental model: you provision containers much the same way you
provision a normal virtualized or dedicated server. For more information, read provision a normal virtualized or dedicated server. For more information, read
the section on [Dockerfiles](#dockerfiles). the section on [Dockerfiles](#dockerfiles).
The Docker builder must run on a machine that has Docker installed. Therefore The Docker builder must run on a machine that has Docker Engine installed.
the builder only works on machines that support Docker. You can learn about Therefore the builder only works on machines that support Docker and _does not
what [platforms Docker supports and how to install onto them](https://docs.docker.com/engine/installation/) in the Docker documentation. support running on a Docker remote host_. You can learn about what
[platforms Docker supports and how to install onto them](https://docs.docker.com/engine/installation/)
in the Docker documentation.
## Basic Example: Export ## Basic Example: Export
@ -125,9 +127,8 @@ Configuration options are organized below into two categories: required and
optional. Within each category, the available options are alphabetized and optional. Within each category, the available options are alphabetized and
described. described.
In addition to the options listed here, a The Docker builder uses a special Docker communicator _and will not use_ the
[communicator](/docs/templates/communicator.html) can be configured for this standard [communicators](/docs/templates/communicator.html).
builder.
### Required: ### Required: