mirror of https://github.com/docker/docs.git
Fixed typos
This commit is contained in:
Pascal Borreli
parent
d53c6798c9
commit
6cd3fe8bd2
|
|
@ -808,7 +808,7 @@ an error if it doesn't exist.
|
|||
`external` cannot be used in conjunction with other volume configuration keys
|
||||
(`driver`, `driver_opts`).
|
||||
|
||||
In the example below, instead of attemping to create a volume called
|
||||
In the example below, instead of attempting to create a volume called
|
||||
`[projectname]_data`, Compose will look for an existing volume simply
|
||||
called `data` and mount it into the `db` service's containers.
|
||||
|
||||
|
|
@ -898,7 +898,7 @@ an error if it doesn't exist.
|
|||
(`driver`, `driver_opts`, `ipam`).
|
||||
|
||||
In the example below, `proxy` is the gateway to the outside world. Instead of
|
||||
attemping to create a network called `[projectname]_outside`, Compose will
|
||||
attempting to create a network called `[projectname]_outside`, Compose will
|
||||
look for an existing network simply called `outside` and connect the `proxy`
|
||||
service's containers to it.
|
||||
|
||||
|
|
|
|||
|
|
@ -150,4 +150,4 @@ If you want your containers to join a pre-existing network, use the [`external`
|
|||
external:
|
||||
name: my-pre-existing-network
|
||||
|
||||
Instead of attemping to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
|
||||
Instead of attempting to create a network called `[projectname]_default`, Compose will look for a network called `my-pre-existing-network` and connect your app's containers to it.
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ This release addresses the following issues:
|
|||
[#22947](https://github.com/docker/docker/pull/22947)
|
||||
* Fix a possible deadlock on image deletion and container attach
|
||||
[#22918](https://github.com/docker/docker/pull/22918)
|
||||
* Fix an issue causing `docker ps` to hange when using devicemapper
|
||||
* Fix an issue causing `docker ps` to hang when using devicemapper
|
||||
[#22168](https://github.com/docker/docker/pull/22168)
|
||||
* Fix a bug preventing to `docker exec` into a container when using
|
||||
devicemapper [#22168](https://github.com/docker/docker/pull/22168)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ The user can still modify the stack definition before deployment.
|
|||
|
||||
## Adding the 'Deploy to Docker Cloud' button in GitHub
|
||||
|
||||
You can simply add the following snipet to your `README.md` file:
|
||||
You can simply add the following snippet to your `README.md` file:
|
||||
|
||||
```md
|
||||
[](https://cloud.docker.com/stack/deploy/)
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ Docker Cloud's service linking is modeled on [Docker Compose links](https://docs
|
|||
|
||||
When you link a "client" service to a "server" service, Docker Cloud performs the following actions on the "client" service:
|
||||
|
||||
1. Creates a group of environment variables that contian information about the exposed ports of the "server" service, including its IP address, port and protocol.
|
||||
1. Creates a group of environment variables that contain information about the exposed ports of the "server" service, including its IP address, port and protocol.
|
||||
2. Copies all of the "server" service environment variables to the "client" service with an `HOSTNAME_ENV_` prefix.
|
||||
3. Adds a DNS hostname to the Docker Cloud DNS service that resolves to the "server" service IP address.
|
||||
|
||||
Some environment variables such as the API endpoint are updated when a serivce scales up or down. Service links are only updated when a service is deployed or redeployed, but are not updated during runtime. No new service link environment variables are created when a service scales up or down.
|
||||
Some environment variables such as the API endpoint are updated when a service scales up or down. Service links are only updated when a service is deployed or redeployed, but are not updated during runtime. No new service link environment variables are created when a service scales up or down.
|
||||
|
||||
### Service link example
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ Imagine that you are running a web service (`my-web-app`) with 2 containers (`my
|
|||
|
||||
Several environment variables are set on each container at startup to provide link details to other containers. The links created are directional. These are similar to those used by Docker Compose.
|
||||
|
||||
For our example app above, the following enviroment variables are set in the proxy containers to provide service links. The example proxy application can use these environment variables to configure itself on startup, and start balancing traffic between the two containers of `my-web-app`.
|
||||
For our example app above, the following environment variables are set in the proxy containers to provide service links. The example proxy application can use these environment variables to configure itself on startup, and start balancing traffic between the two containers of `my-web-app`.
|
||||
|
||||
| Name | Value |
|
||||
|:------------------------|:----------------------|
|
||||
|
|
|
|||
|
|
@ -78,4 +78,4 @@ whenever a new image is pushed. See the [Autoredeploy documentation](auto-redepl
|
|||
## Redeploy a service using webhooks
|
||||
|
||||
You can also use **triggers** to redeploy a service, for example when its image
|
||||
is pushed or rebuilt in a third-party registry. See the [Triggers documentaiton](triggers.md) to learn more.
|
||||
is pushed or rebuilt in a third-party registry. See the [Triggers documentation](triggers.md) to learn more.
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ restart: always
|
|||
```
|
||||
|
||||
## roles
|
||||
A list of Docker Cloud API roles to grant the service. The only supported value is `global`, which creates an environment variable `DOCKERCLOUD_AUTH` used to authenticate againts Docker Cloud API. Learn more [here](api-roles.md).
|
||||
A list of Docker Cloud API roles to grant the service. The only supported value is `global`, which creates an environment variable `DOCKERCLOUD_AUTH` used to authenticate against Docker Cloud API. Learn more [here](api-roles.md).
|
||||
|
||||
```yml
|
||||
roles:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ file that defines the three services (lb, web, redis) you created in the
|
|||
previous steps, including all modifications and environment variables.
|
||||
|
||||
This is what the `docker-cloud.yml` file looks like. (If you are using the
|
||||
quickstart-go version, you'll see `quickstart-go` indstead of
|
||||
quickstart-go version, you'll see `quickstart-go` instead of
|
||||
`quickstart-python`.)
|
||||
|
||||
```yml
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ fmt.Fprintf(w, "<h1>hello, %s</h1>\n<b>Hostname: </b>%s<br><b>MongoDB Status: </
|
|||
|
||||
## Edit an environment variable
|
||||
|
||||
If you modify the enviroment variable, the message the app shows when you curl or visit the service webpage changes accordingly. Let's try it!
|
||||
If you modify the environment variable, the message the app shows when you curl or visit the service webpage changes accordingly. Let's try it!
|
||||
|
||||
Run the following command to change the **NAME** variable, and then redeploy the `web` service.
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ title: ' Example Applications'
|
|||
|
||||
Upcoming releases will include example applications especially tailored for Docker for Mac and Docker for Windows.
|
||||
|
||||
Examples will highlight develop, build, and run workfows in several languages, including Node.js, Python, Ruby, and Java.
|
||||
Examples will highlight develop, build, and run workflows in several languages, including Node.js, Python, Ruby, and Java.
|
||||
|
||||
For now, if you want get started experimenting with the Beta apps and Docker Compose (which is installed automatically with Docker Desktop Editions), have a look at these example applications in the Compose documentation. You should be able to run these with Docker for Mac and Docker for Windows.
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ For now, if you want get started experimenting with the Beta apps and Docker Com
|
|||
|
||||
<a href=https://docs.docker.com/compose/wordpress/ target="_blank">Quickstart: Compose and WordPress</a>
|
||||
|
||||
See also [learn by example](/engine/tutorials/index.md) tutorials on building images, runnning containers, networking, managing data, and storing images on Docker Hub.
|
||||
See also [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.
|
||||
|
||||
<hr style="color:#99CC99" />
|
||||
<ul class="media">
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ A: Two different download channels are available for Docker for Mac:
|
|||
|
||||
**Q: Can I switch back and forth between stable and beta versions of Docker for Mac?**
|
||||
|
||||
A: Yes, you can switch between versions to try out the betas to see what's new, then go back to stable for other work. However, **you can have only one app installed at a time**. Switching back and forth between stable and beta apps can de-stabilize your development environment, particularly in cases where you switch from a newer (beta) channel to older (stable).
|
||||
A: Yes, you can switch between versions to try out the betas to see what's new, then go back to stable for other work. However, **you can have only one app installed at a time**. Switching back and forth between stable and beta apps can destabilize your development environment, particularly in cases where you switch from a newer (beta) channel to older (stable).
|
||||
|
||||
For example, containers created with a newer beta version of Docker for Mac may not work after you switch back to stable because they may have been created leveraging beta features that aren't in stable yet. Just keep this in mind as you create and work with beta containers, perhaps in the spirit of a playground space where you are prepared to troubleshoot or start over.
|
||||
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@ Run these commands to test if your versions of `docker`, `docker-compose`, and `
|
|||
|
||||
To stop and remove the running container with a single command, type: `docker rm -f webserver`. This will remove the container, but not the `nginx` image. You can list local images with `docker images`. You might want to keep some images around so that you don't have to pull them again from Docker Hub. To remove an image you no longer need, use `docker rmi <imageID>|<imageName>`. For example, `docker rmi nginx`.
|
||||
|
||||
**Want more example applictions?** - For more example walkthroughs that include setting up services and databases in Docker Compose, see [Example Applications](examples.md).
|
||||
**Want more example applications?** - For more example walkthroughs that include setting up services and databases in Docker Compose, see [Example Applications](examples.md).
|
||||
|
||||
## Preferences
|
||||
|
||||
|
|
@ -263,7 +263,7 @@ ln -s /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-comple
|
|||
|
||||
* Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial.
|
||||
|
||||
* Dig in deeper with [learn by example](/engine/tutorials/index.md) tutorials on on building images, runnning containers, networking, managing data, and storing images on Docker Hub.
|
||||
* Dig in deeper with [learn by example](/engine/tutorials/index.md) tutorials on on building images, running containers, networking, managing data, and storing images on Docker Hub.
|
||||
|
||||
* See [Example Applications](examples.md) for example applications that include setting up services and databases in Docker Compose.
|
||||
|
||||
|
|
@ -275,7 +275,7 @@ ln -s /Applications/Docker.app/Contents/Resources/etc/docker-compose.bash-comple
|
|||
|
||||
* For a summary of Docker command line interface (CLI) commands, see [Docker CLI Reference Guide](/engine/reference/index.md).
|
||||
|
||||
* Check out the <a href="https://blog.docker.com/2016/06/docker-mac-windows-public-beta/">blog posts</a> on Docker for Mac and Docker for Windows public betas, and <a href="https://blog.docker.com/2016/03/docker-for-mac-windows-beta/">earlier posts</a> on the intial private beta.
|
||||
* Check out the <a href="https://blog.docker.com/2016/06/docker-mac-windows-public-beta/">blog posts</a> on Docker for Mac and Docker for Windows public betas, and <a href="https://blog.docker.com/2016/03/docker-for-mac-windows-beta/">earlier posts</a> on the initial private beta.
|
||||
|
||||
* Please give feedback on your experience with the app and report bugs and problems by logging into our [Docker for Mac forum](https://forums.docker.com/c/docker-for-mac).
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ This interface is actually within `HyperKit`.
|
|||
|
||||
### I cannot ping my containers
|
||||
|
||||
Unfortunately, due to limtations in OSX, we're unable to route traffic to containers, and from containers back to the host.
|
||||
Unfortunately, due to limitations in OSX, we're unable to route traffic to containers, and from containers back to the host.
|
||||
|
||||
### Per-container IP addressing is not possible
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ title: ' Example Applications'
|
|||
|
||||
Upcoming releases will include example applications especially tailored for Docker for Mac and Docker for Windows.
|
||||
|
||||
Examples will highlight develop, build, and run workfows in several languages, including Node.js, Python, Ruby, and Java.
|
||||
Examples will highlight develop, build, and run workflows in several languages, including Node.js, Python, Ruby, and Java.
|
||||
|
||||
For now, if you want get started experimenting with the Beta apps and Docker Compose (which is installed automatically with Docker Desktop Editions), have a look at these example applications in the Compose documentation. You should be able to run these with Docker for Mac and Docker for Windows.
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ For now, if you want get started experimenting with the Beta apps and Docker Com
|
|||
|
||||
<a href=https://docs.docker.com/compose/wordpress/ target="_blank">Quickstart: Compose and WordPress</a>
|
||||
|
||||
See also [learn by example](/engine/tutorials/index.md) tutorials on building images, runnning containers, networking, managing data, and storing images on Docker Hub.
|
||||
See also [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.
|
||||
|
||||
<hr style="color:#99CC99" />
|
||||
<ul class="media">
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ A: Two different download channels are available for Docker for Windows:
|
|||
A: Yes, you can switch between versions to try out the betas to see what's new,
|
||||
then go back to stable for other work. However, **you can have only one app
|
||||
installed at a time**. Switching back and forth between stable and beta apps can
|
||||
de-stabilize your development environment, particularly in cases where you
|
||||
destabilize your development environment, particularly in cases where you
|
||||
switch from a newer (beta) channel to older (stable).
|
||||
|
||||
For example, containers created with a newer beta version of Docker for Windows
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ To get a popup menu with application options, right-click the whale:
|
|||
|
||||
|
||||
|
||||
The **Settings** dialogs provide options to allow Docker auto-start, automatically check for updates, share local drives with Docker containers, enable VPN compatibilty, manage CPUs and memory Docker uses, restart Docker, or perform a factory reset.
|
||||
The **Settings** dialogs provide options to allow Docker auto-start, automatically check for updates, share local drives with Docker containers, enable VPN compatibility, manage CPUs and memory Docker uses, restart Docker, or perform a factory reset.
|
||||
|
||||
**Beta 26** includes an option to switch between Windows and Linux conatiners. See [Switch between Windows and Linux containers (Beta 26)](#switch-between-windows-and-linux-containers-beta-26). This is not yet available on stable builds.
|
||||
|
||||
|
|
@ -321,7 +321,7 @@ You can configure Docker for Windows networking to work on a virtual private net
|
|||
|
||||
|
||||
|
||||
>**Note:** Some users reported problems connecting to Docker Hub on Docker for Windows stable version. This would manifest as an error when trying to run `docker` commands that pull images from Docker Hub that are not alredy downloaded, such as a first time run of `docker run hello-world`. If you encounter this, reset the DNS server to use the Google DNS fixed address: `8.8.8.8`. For more information, see [Networking issues](troubleshoot.md#networking-issues) in Troubleshooting.
|
||||
>**Note:** Some users reported problems connecting to Docker Hub on Docker for Windows stable version. This would manifest as an error when trying to run `docker` commands that pull images from Docker Hub that are not already downloaded, such as a first time run of `docker run hello-world`. If you encounter this, reset the DNS server to use the Google DNS fixed address: `8.8.8.8`. For more information, see [Networking issues](troubleshoot.md#networking-issues) in Troubleshooting.
|
||||
|
||||
Note that updating these settings requires a reconfiguration and reboot of the Linux VM.
|
||||
|
||||
|
|
@ -400,7 +400,7 @@ If you want to go back to using Docker Toolbox, you have to disable the Hyper-V
|
|||
|
||||
* Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial.
|
||||
|
||||
* Dig in deeper with [learn by example](/engine/tutorials/index.md) tutorials on building images, runnning containers, networking, managing data, and storing images on Docker Hub.
|
||||
* Dig in deeper with [learn by example](/engine/tutorials/index.md) tutorials on building images, running containers, networking, managing data, and storing images on Docker Hub.
|
||||
|
||||
* See [Example Applications](examples.md) for example applications that include setting up services and databases in Docker Compose.
|
||||
|
||||
|
|
@ -412,7 +412,7 @@ If you want to go back to using Docker Toolbox, you have to disable the Hyper-V
|
|||
|
||||
* For a summary of Docker command line interface (CLI) commands, see [Docker CLI Reference Guide](/engine/reference/index.md).
|
||||
|
||||
* Check out the <a href="https://blog.docker.com/2016/06/docker-mac-windows-public-beta/">blog posts</a> on Docker for Mac and Docker for Windows public betas, and <a href="https://blog.docker.com/2016/03/docker-for-mac-windows-beta/">earlier posts</a> on the intial private beta.
|
||||
* Check out the <a href="https://blog.docker.com/2016/06/docker-mac-windows-public-beta/">blog posts</a> on Docker for Mac and Docker for Windows public betas, and <a href="https://blog.docker.com/2016/03/docker-for-mac-windows-beta/">earlier posts</a> on the initial private beta.
|
||||
|
||||
* Please give feedback on your experience with the app and report bugs and problems by logging into our [Docker for Windows forum](https://forums.docker.com/c/docker-for-windows).
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ title: Open Source Licensing
|
|||
|
||||
# Open Source Components and Licensing
|
||||
|
||||
Docker Desktop Editions are built using open source software software. For details on the licensing, choose <img src="../images/whale-x.png"> --> **About** from within the application, then click **Acknowlegdements**.
|
||||
Docker Desktop Editions are built using open source software software. For details on the licensing, choose <img src="../images/whale-x.png"> --> **About** from within the application, then click **Acknowledgements**.
|
||||
|
||||
Docker Desktop Editions distribute some components that are licensed under the GNU General Public License. You can download the source for these components [here](https://download.docker.com/opensource/License.tar.gz).
|
||||
|
||||
|
|
|
|||
|
|
@ -492,7 +492,7 @@ Unreleased. See Beta 23 for changes.
|
|||
|
||||
* Moved `Import from toolbox` option to the General Settings
|
||||
* Increased the timeout to write to the configuration database
|
||||
* Fixed an issue where sending anonynous stats to Mixpanel made the application stop
|
||||
* Fixed an issue where sending anonymous stats to Mixpanel made the application stop
|
||||
* Faster boot time
|
||||
* All named pipes are now prefixed with the word `docker`
|
||||
* Full version number is now displayed in the update window
|
||||
|
|
@ -575,7 +575,7 @@ This Beta release includes some significant changes:
|
|||
|
||||
**Hot fixes**
|
||||
|
||||
* Fixed an issue with named pipe permisions that prevented Docker from starting
|
||||
* Fixed an issue with named pipe permissions that prevented Docker from starting
|
||||
|
||||
### Beta 11 Release (2016-05-10 1.11.1-beta11)
|
||||
|
||||
|
|
@ -619,7 +619,7 @@ This Beta release includes some significant changes:
|
|||
|
||||
* Improved Settings panel, allow to configure the VM’s memory and CPUs
|
||||
* Co-exist with multiple internal Hyper-V switches and improved DHCP handling
|
||||
* Token validation is now done over HTTPS. This should fix issues with some firewalls and antiviros software.
|
||||
* Token validation is now done over HTTPS. This should fix issues with some firewalls and antivirus software.
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ need to add the Service Hook manually.
|
|||
|
||||
To add, confirm, or modify the service hook, log in to GitHub, then navigate to
|
||||
the repository, click "Settings" (the gear), then select "Webhooks & Services".
|
||||
You must have Administrator privileges on the repository to view or modfy
|
||||
You must have Administrator privileges on the repository to view or modify
|
||||
this setting.
|
||||
|
||||
The image below shows the "Docker" Service Hook.
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ publishing all Official Repositories content. This team works in collaboration
|
|||
with upstream software maintainers, security experts, and the broader Docker
|
||||
community.
|
||||
|
||||
While it is preferrable to have upstream software authors maintaining their
|
||||
While it is preferable to have upstream software authors maintaining their
|
||||
corresponding Official Repositories, this is not a strict requirement. Creating
|
||||
and maintaining images for Official Repositories is a public process. It takes
|
||||
place openly on GitHub where participation is encouraged. Anyone can provide
|
||||
|
|
@ -119,9 +119,9 @@ Official Repository is "generally useful" to the large Python developer
|
|||
community, whereas an obscure text adventure game written in Python last week is
|
||||
not.
|
||||
|
||||
Once a new proposal is accepted, the author is responsibile for keeping
|
||||
Once a new proposal is accepted, the author is responsible for keeping
|
||||
their images up-to-date and responding to user feedback. The Official
|
||||
Repositories team becomes responsibile for publishing the images and
|
||||
Repositories team becomes responsible for publishing the images and
|
||||
documentation on Docker Hub. Updates to the Official Repository follow the same
|
||||
pull request process, though with less review. The Official Repositories team
|
||||
ultimately acts as a gatekeeper for all changes, which helps mitigate the risk
|
||||
|
|
|
|||
|
|
@ -61,6 +61,6 @@ Title capitalizes a string.
|
|||
|
||||
### Upper
|
||||
|
||||
Upper turms a string into its upper case representation.
|
||||
Upper turns a string into its upper case representation.
|
||||
|
||||
$ docker inspect --format "{{upper .Name}}" container
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ compresses each log message. The accepted values are `gzip`, `zlib` and `none`.
|
|||
`gzip` is chosen by default.
|
||||
|
||||
The `gelf-compression-level` option can be used to change the level of
|
||||
compresssion when `gzip` or `zlib` is selected as `gelf-compression-type`.
|
||||
compression when `gzip` or `zlib` is selected as `gelf-compression-type`.
|
||||
Accepted value must be from from -1 to 9 (BestCompression). Higher levels
|
||||
typically run slower but compress more. Default value is 1 (BestSpeed).
|
||||
|
||||
|
|
|
|||
|
|
@ -503,7 +503,7 @@ default is `/bin/sh -c` on Linux or `cmd /S /C` on Windows)
|
|||
- `RUN ["executable", "param1", "param2"]` (*exec* form)
|
||||
|
||||
The `RUN` instruction will execute any commands in a new layer on top of the
|
||||
current image and commit the results. The resulting comitted image will be
|
||||
current image and commit the results. The resulting committed image will be
|
||||
used for the next step in the `Dockerfile`.
|
||||
|
||||
Layering `RUN` instructions and generating commits conforms to the core
|
||||
|
|
|
|||
|
|
@ -617,7 +617,7 @@ options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`.
|
|||
|
||||
* `btrfs.min_space`
|
||||
|
||||
Specifies the mininum size to use when creating the subvolume which is used
|
||||
Specifies the minimum size to use when creating the subvolume which is used
|
||||
for containers. If user uses disk quota for btrfs when creating or running
|
||||
a container with **--storage-opt size** option, docker should ensure the
|
||||
**size** cannot be smaller than **btrfs.min_space**.
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ you can download them from:
|
|||
|
||||
### Usage
|
||||
|
||||
You need to speficy the credentials store in `$HOME/.docker/config.json`
|
||||
You need to specify the credentials store in `$HOME/.docker/config.json`
|
||||
to tell the docker engine to use it:
|
||||
|
||||
```json
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ at least 3 stars and the description isn't truncated in the output:
|
|||
|
||||
## Limit search results (--limit)
|
||||
|
||||
The flag `--limit` is the maximium number of results returned by a search. This value could
|
||||
The flag `--limit` is the maximum number of results returned by a search. This value could
|
||||
be in the range between 1 and 100. The default value of `--limit` is 25.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ While it is possible to scale a swarm down to a single manager node, it is
|
|||
impossible to demote the last manager node. This ensures you maintain access to
|
||||
the swarm and that the swarm can still process requests. Scaling down to a
|
||||
single manager is an unsafe operation and is not recommended. If
|
||||
the last node leaves the swarm unexpetedly during the demote operation, the
|
||||
the last node leaves the swarm unexpectedly during the demote operation, the
|
||||
swarm will become unavailable until you reboot the node or restart with
|
||||
`--force-new-cluster`.
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ swarm mode. To take full advantage of swarm mode you can add nodes to the swarm:
|
|||
* Adding worker nodes increases capacity. When you deploy a service to a swarm,
|
||||
the Engine schedules tasks on available nodes whether they are worker nodes or
|
||||
manager nodes. When you add workers to your swarm, you increase the scale of
|
||||
the swarm to handle tasks without affecting the manager raft consenus.
|
||||
the swarm to handle tasks without affecting the manager raft consensus.
|
||||
* Manager nodes increase fault-tolerance. Manager nodes perform the
|
||||
orchestration and cluster management functions for the swarm. Among manager
|
||||
nodes, a single leader node conducts orchestration tasks. If a leader node
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ different nodes. For more information, refer to [Docker swarm mode overlay netwo
|
|||
The `--subnet` flag specifies the subnet for use with the overlay network. When
|
||||
you don't specify a subnet, the swarm manager automatically chooses a subnet and
|
||||
assigns it to the network. On some older kernels, including kernel 3.10,
|
||||
automatically assigned adresses may overlap with another subnet in your
|
||||
automatically assigned addresses may overlap with another subnet in your
|
||||
infrastructure. Such overlaps can cause connectivity issues or failures with containers connected to the network.
|
||||
|
||||
Before you attach a service to the network, the network only extends to manager
|
||||
|
|
@ -299,7 +299,7 @@ Address 3: 10.0.9.9 my-dnsrr-service.2.am6fx47p3bropyy2dy4f8hofb.my-network
|
|||
|
||||
## Confirm VIP connectivity
|
||||
|
||||
In genaral we recommend you use `dig`, `nslookup`, or another DNS query tool to
|
||||
In general we recommend you use `dig`, `nslookup`, or another DNS query tool to
|
||||
test access to the service name via DNS. Because a VIP is a logical IP, `ping`
|
||||
is not the right tool to confirm VIP connectivity.
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ as follows:
|
|||
* designates the current node as a leader manager node for the swarm.
|
||||
* names the node with the machine hostname.
|
||||
* configures the manager to listen on an active network interface on port 2377.
|
||||
* sets the current node to `Active` availability, meanining it can receive tasks
|
||||
* sets the current node to `Active` availability, meaning it can receive tasks
|
||||
from the scheduler.
|
||||
* starts an internal distributed data store for Engines participating in the
|
||||
swarm to maintain a consistent view of the swarm and all services running on it.
|
||||
|
|
@ -92,7 +92,7 @@ reach the first manager node is not the same address the manager sees as its
|
|||
own. For instance, in a cloud setup that spans different regions, hosts have
|
||||
both internal addresses for access within the region and external addresses that
|
||||
you use for access from outside that region. In this case, specify the external
|
||||
address with `--advertise-addr` so that the node can propogate that information
|
||||
address with `--advertise-addr` so that the node can propagate that information
|
||||
to other nodes that subsequently connect to it.
|
||||
|
||||
Refer to the `docker swarm init` [CLI reference](../reference/commandline/swarm_init.md)
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ step-by-step. You can see that each step creates a new container, runs
|
|||
the instruction inside that container and then commits that change -
|
||||
just like the `docker commit` work flow you saw earlier. When all the
|
||||
instructions have executed you're left with the `97feabe5d2ed` image
|
||||
(also helpfuly tagged as `ouruser/sinatra:v2`) and all intermediate
|
||||
(also helpfully tagged as `ouruser/sinatra:v2`) and all intermediate
|
||||
containers will get removed to clean things up.
|
||||
|
||||
> **Note:**
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ assumes that the Docker daemon is in the `stopped` state.
|
|||
|
||||
9. Modify the `thin_pool_autoextend_percent` for when thin pool autoextension occurs.
|
||||
|
||||
The value's setting is the perentage of space to increase the thin pool (100 =
|
||||
The value's setting is the percentage of space to increase the thin pool (100 =
|
||||
disabled)
|
||||
|
||||
```
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ To generate your access token:
|
|||
|
||||
### Step 4. Run Docker commands on the Droplet
|
||||
|
||||
1. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip <machine>` gets the host IP adddress and `docker-machine inspect <machine>` lists all the details.
|
||||
1. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip <machine>` gets the host IP address and `docker-machine inspect <machine>` lists all the details.
|
||||
|
||||
$ docker-machine ip docker-sandbox
|
||||
104.131.43.236
|
||||
|
|
|
|||
|
|
@ -17,5 +17,5 @@ You also help the countless number of other project participants.
|
|||
|
||||
- [Configure the development environment](project/who-written-for.md) explains how to setup an environment to contribute to Docker engine.
|
||||
- [Understand the contribution workflow ](workflow/make-a-contribution.md) explains the workflow the team uses across most Docker projects.
|
||||
- [Other ways to contribute](ways/index.md) provides tips for contributing if you dont' want to code.
|
||||
- [Other ways to contribute](ways/index.md) provides tips for contributing if you don't want to code.
|
||||
- [Governance](governance/index.md) describes the proper conduct and who defines it.
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ Hackday Picture
|
|||
We are always looking for new office space to host Docker Meetups. If your
|
||||
company is willing to host a Docker Meetup, please contact us by email at
|
||||
meetup@docker.com. Previous Docker Meetups have been hosted by companies such
|
||||
as Rackspace, Twitter, MongoDB, BrightCove, DigitlOcean, Viadeo and Edmodo
|
||||
as Rackspace, Twitter, MongoDB, BrightCove, DigitalOcean, Viadeo and Edmodo
|
||||
|
||||
### How many attendees?
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ Garbage collection can be run as follows
|
|||
`bin/registry garbage-collect [--dry-run] /path/to/config.yml`
|
||||
|
||||
The garbage-collect command accepts a `--dry-run` parameter, which will print the progress
|
||||
of the mark and sweep phases without removing any data. Running with a log leve of `info`
|
||||
of the mark and sweep phases without removing any data. Running with a log level of `info`
|
||||
will give a clear indication of what will and will not be deleted.
|
||||
|
||||
_Sample output from a dry run garbage collection with registry log level set to `info`_
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ the Docker Engine daemon accepts commands from this trusted Docker Engine CLI.
|
|||
|
||||
The Docker Engine CLI is simply a client that uses the Docker Engine Remote API to
|
||||
communicate with the Docker Engine daemon. Any client that uses this Docker Engine Remote API can use
|
||||
TLS. For example, Dcoker Engine clients such as 'Docker Universal Control Plane'
|
||||
TLS. For example, Docker Engine clients such as 'Docker Universal Control Plane'
|
||||
(UCP) have TLS support built-in. Other, third party products, that use Docker Engine
|
||||
Remote API, can also be configured this way.
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ aliases:
|
|||
- /swarm/swarm_at_scale/about/
|
||||
description: Try Swarm at scale
|
||||
keywords:
|
||||
- docker, swarm, scale, voting, application, archiecture
|
||||
- docker, swarm, scale, voting, application, architecture
|
||||
menu:
|
||||
main:
|
||||
parent: scale_swarm
|
||||
|
|
@ -33,7 +33,7 @@ vote is counted.
|
|||
The voting application is composed of several microservices. It uses a parallel
|
||||
web frontend that sends jobs to asynchronous background workers. The
|
||||
application's design can accommodate arbitrarily large scale. The diagram below
|
||||
shows the appliation's high level architecture:
|
||||
shows the application's high level architecture:
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -303,15 +303,15 @@ the containers at once. This extra credit
|
|||
|
||||
In general, Compose starts services in reverse order they appear in the file.
|
||||
So, if you want a service to start before all the others, make it the last
|
||||
service in the file file. This applciation relies on a volume and a network,
|
||||
service in the file file. This application relies on a volume and a network,
|
||||
declare those at the bottom of the file.
|
||||
|
||||
3. Check your work against <a href="../docker-compose.yml" target="_blank">this
|
||||
result file</a>
|
||||
|
||||
4. When you are satisifed, save the `docker-compose.yml` file to your system.
|
||||
4. When you are satisfied, save the `docker-compose.yml` file to your system.
|
||||
|
||||
5. Set `DOCKER_HOST` to the Swarm manager.
|
||||
5. Set `DOCKER_HOST` to the Swarm manager.
|
||||
|
||||
```bash
|
||||
$ DOCKER_HOST=$(docker-machine ip manager):3376
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@ infrastructure you wish. For example, you could place the application on another
|
|||
public cloud platform such as Azure or DigitalOcean, on premises in your data
|
||||
center, or even in in a test environment on your laptop.
|
||||
|
||||
Finally, these instructions use some common `bash` command substituion techniques to
|
||||
Finally, these instructions use some common `bash` command substitution techniques to
|
||||
resolve some values, for example:
|
||||
|
||||
```bash
|
||||
$ eval $(docker-machine env keystore)
|
||||
```
|
||||
|
||||
In a Windows environment, these substituation fail. If you are running in
|
||||
In a Windows environment, these substitution fail. If you are running in
|
||||
Windows, replace the substitution `$(docker-machine env keystore)` with the
|
||||
actual value.
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ One way to solve this problem is to update the file `/var/lib/boot2docker/profil
|
|||
|
||||
This file lives on the VM itself, so you have to `ssh` into the machine, then edit and save the file there.
|
||||
|
||||
You can add your machine addresses as values for a `NO_PROXY` setting, and also speicify proxy servers that you know about and you want to use. Typically setting your Docker machine URLs to `NO_PROXY` solves this type of connectivity problem, so that example is shown here.
|
||||
You can add your machine addresses as values for a `NO_PROXY` setting, and also specify proxy servers that you know about and you want to use. Typically setting your Docker machine URLs to `NO_PROXY` solves this type of connectivity problem, so that example is shown here.
|
||||
|
||||
1. Use `ssh` to log in to the virtual machine (e.g., `default`).
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Choose the install instructions for your platform, and follow the steps:
|
|||
|
||||
* Try out the examples in the [Getting Started](/engine/getstarted/index.md) tutorial.
|
||||
|
||||
* Dig in deeper with [more tutorials and examples](/engine/tutorials/index.md) on building images, runnning containers, networking, managing data, and storing images on Docker Hub.
|
||||
* Dig in deeper with [more tutorials and examples](/engine/tutorials/index.md) on building images, running containers, networking, managing data, and storing images on Docker Hub.
|
||||
|
||||
* [Learn about Kitematic](/kitematic/userguide.md)
|
||||
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ $ docker exec -it ucp-kv etcdctl \
|
|||
Removed member c5a24cfdb4263e72 from cluster
|
||||
```
|
||||
|
||||
If your cluser has lost too many members, etcd refuses to remove
|
||||
If your cluster has lost too many members, etcd refuses to remove
|
||||
members using this tool. Instead you must use the UCP backup and restore
|
||||
functionality to reset your cluster to a single controller node cluster.
|
||||
[Learn more about backups and disaster recovery](../high-availability/backups-and-disaster-recovery.md).
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ docker run --rm -it \
|
|||
When running the 'join' command, you must run this tool
|
||||
on the engine you wish to join to an existing UCP. The UCP controller
|
||||
must be running on a different engine. Both engines must have network
|
||||
visibility to eachother and have the required ports open on their firewall
|
||||
visibility to each other and have the required ports open on their firewall
|
||||
settings. If your system has multiple IP addresses, you may need to
|
||||
specify the '--host-address' option to ensure the correct address is used.
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ characters. This will be fixed in a future release. (Fixed in UCP 1.1.2)
|
|||
* Added the 'stop' and 'restart' commands, to stop and start UCP containers.
|
||||
|
||||
* UI
|
||||
* Now you can deploy apps from the UI using a docker-compse.yml file.
|
||||
* Now you can deploy apps from the UI using a docker-compose.yml file.
|
||||
* There's a new setting to prevent users from deploying containers to the UCP
|
||||
controller nodes.
|
||||
* Improved usability of LDAP configuration settings.
|
||||
|
|
|
|||
Loading…
Reference in New Issue