mirror of https://github.com/docker/docs.git
Cleanup (#6864)
This commit is contained in:
parent
cd78aacee9
commit
a55d0c9dfc
|
@ -30,12 +30,12 @@ swarm.
|
|||
You are prompted for your Docker ID and password, then the local Docker Engine downloads a containerized Docker Cloud client tool, and connects to the swarm.
|
||||
|
||||
```
|
||||
$ docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST dockercloud/client orangesnap/vote-swarm
|
||||
$ docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST dockercloud/client gordon/vote-swarm
|
||||
Use your Docker ID credentials to authenticate:
|
||||
Username: orangesnap
|
||||
Username: gordon
|
||||
Password:
|
||||
|
||||
=> You can now start using the swarm orangesnap/vote-swarm by executing:
|
||||
=> You can now start using the swarm gordon/vote-swarm by executing:
|
||||
export DOCKER_HOST=tcp://127.0.0.1:32770
|
||||
```
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ slow](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-
|
|||
this topic provides an explanation of the issues, recent progress in addressing
|
||||
them, how the community can help us, and what you can expect in the
|
||||
future. This explanation derives from a [post about understanding
|
||||
performance](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076/158?u=orangesnap)
|
||||
performance](https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076/158)
|
||||
by David Sheets (@dsheets) on the [Docker development
|
||||
team](https://forums.docker.com/groups/Docker) to the forum topic just
|
||||
mentioned. We want to surface it in the documentation for wider reach.
|
||||
|
|
|
@ -172,7 +172,7 @@ REPOSITORY TAG IMAGE ID
|
|||
friendlyhello latest 326387cea398
|
||||
|
||||
```
|
||||
> Troubleshooting for Linux users
|
||||
> Troubleshooting for Linux users
|
||||
>
|
||||
> _DNS settings_
|
||||
>
|
||||
|
@ -189,9 +189,9 @@ friendlyhello latest 326387cea398
|
|||
>
|
||||
> _Proxy server settings_
|
||||
>
|
||||
> DNS misconfigurations can generate problems with `pip`. You need to set your
|
||||
> own DNS server address to make `pip` work properly. You might want
|
||||
> to change the DNS settings of the Docker daemon. You can edit (or create) the
|
||||
> DNS misconfigurations can generate problems with `pip`. You need to set your
|
||||
> own DNS server address to make `pip` work properly. You might want
|
||||
> to change the DNS settings of the Docker daemon. You can edit (or create) the
|
||||
> configuration file at `/etc/docker/daemon.json` with the `dns` key, as following:
|
||||
>
|
||||
> ```json
|
||||
|
@ -330,7 +330,7 @@ docker tag image username/repository:tag
|
|||
For example:
|
||||
|
||||
```shell
|
||||
docker tag friendlyhello john/get-started:part2
|
||||
docker tag friendlyhello gordon/get-started:part2
|
||||
```
|
||||
|
||||
Run [docker image ls](/engine/reference/commandline/image_ls/) to see your newly
|
||||
|
@ -341,7 +341,7 @@ $ docker image ls
|
|||
|
||||
REPOSITORY TAG IMAGE ID CREATED SIZE
|
||||
friendlyhello latest d9e555c53008 3 minutes ago 195MB
|
||||
john/get-started part2 d9e555c53008 3 minutes ago 195MB
|
||||
gordon/get-started part2 d9e555c53008 3 minutes ago 195MB
|
||||
python 2.7-slim 1c7128a655f6 5 days ago 183MB
|
||||
...
|
||||
```
|
||||
|
@ -371,9 +371,9 @@ If the image isn't available locally on the machine, Docker pulls it from
|
|||
the repository.
|
||||
|
||||
```shell
|
||||
$ docker run -p 4000:80 john/get-started:part2
|
||||
Unable to find image 'john/get-started:part2' locally
|
||||
part2: Pulling from john/get-started
|
||||
$ docker run -p 4000:80 gordon/get-started:part2
|
||||
Unable to find image 'gordon/get-started:part2' locally
|
||||
part2: Pulling from gordon/get-started
|
||||
10a267c67f42: Already exists
|
||||
f68a39a6a5e4: Already exists
|
||||
9beaffc0cf19: Already exists
|
||||
|
@ -382,7 +382,7 @@ f68a39a6a5e4: Already exists
|
|||
ee7d8f576a14: Already exists
|
||||
fbccdcced46e: Already exists
|
||||
Digest: sha256:0601c866aab2adcc6498200efd0f754037e909e5fd42069adeff72d1e2439068
|
||||
Status: Downloaded newer image for john/get-started:part2
|
||||
Status: Downloaded newer image for gordon/get-started:part2
|
||||
* Running on http://0.0.0.0:80/ (Press CTRL+C to quit)
|
||||
```
|
||||
|
||||
|
|
|
@ -152,8 +152,8 @@ Here is example output from this command.
|
|||
```shell
|
||||
$ docker-machine ls
|
||||
NAME ACTIVE DRIVER STATE URL SWARM DOCKER ERRORS
|
||||
myvm1 - virtualbox Running tcp://192.168.99.100:2376 v17.06.2-ce
|
||||
myvm2 - virtualbox Running tcp://192.168.99.101:2376 v17.06.2-ce
|
||||
myvm1 - virtualbox Running tcp://192.168.99.100:2376 v17.06.2-ce
|
||||
myvm2 - virtualbox Running tcp://192.168.99.101:2376 v17.06.2-ce
|
||||
```
|
||||
|
||||
#### Initialize the swarm and add nodes
|
||||
|
@ -282,8 +282,8 @@ indicated by the asterisk next to it.
|
|||
```shell
|
||||
$ docker-machine ls
|
||||
NAME ACTIVE DRIVER STATE URL SWARM DOCKER ERRORS
|
||||
myvm1 * virtualbox Running tcp://192.168.99.100:2376 v17.06.2-ce
|
||||
myvm2 - virtualbox Running tcp://192.168.99.101:2376 v17.06.2-ce
|
||||
myvm1 * virtualbox Running tcp://192.168.99.100:2376 v17.06.2-ce
|
||||
myvm2 - virtualbox Running tcp://192.168.99.101:2376 v17.06.2-ce
|
||||
```
|
||||
|
||||
{% endcapture %}
|
||||
|
@ -362,7 +362,7 @@ And that's it, the app is deployed on a swarm cluster!
|
|||
>
|
||||
> docker stack deploy --with-registry-auth -c docker-compose.yml getstartedlab
|
||||
> ```
|
||||
>
|
||||
>
|
||||
> This passes the login token from your local client to the swarm nodes where the
|
||||
> service is deployed, using the encrypted WAL logs. With this information, the
|
||||
> nodes are able to log into the registry and pull the image.
|
||||
|
@ -377,11 +377,11 @@ both `myvm1` and `myvm2`.
|
|||
$ docker stack ps getstartedlab
|
||||
|
||||
ID NAME IMAGE NODE DESIRED STATE
|
||||
jq2g3qp8nzwx getstartedlab_web.1 john/get-started:part2 myvm1 Running
|
||||
88wgshobzoxl getstartedlab_web.2 john/get-started:part2 myvm2 Running
|
||||
vbb1qbkb0o2z getstartedlab_web.3 john/get-started:part2 myvm2 Running
|
||||
ghii74p9budx getstartedlab_web.4 john/get-started:part2 myvm1 Running
|
||||
0prmarhavs87 getstartedlab_web.5 john/get-started:part2 myvm2 Running
|
||||
jq2g3qp8nzwx getstartedlab_web.1 gordon/get-started:part2 myvm1 Running
|
||||
88wgshobzoxl getstartedlab_web.2 gordon/get-started:part2 myvm2 Running
|
||||
vbb1qbkb0o2z getstartedlab_web.3 gordon/get-started:part2 myvm2 Running
|
||||
ghii74p9budx getstartedlab_web.4 gordon/get-started:part2 myvm1 Running
|
||||
0prmarhavs87 getstartedlab_web.5 gordon/get-started:part2 myvm2 Running
|
||||
```
|
||||
|
||||
> Connecting to VMs with `docker-machine env` and `docker-machine ssh`
|
||||
|
|
|
@ -273,7 +273,7 @@ Redis service. Be sure to replace `username/repo:tag` with your image details.
|
|||
ID NAME MODE REPLICAS IMAGE PORTS
|
||||
x7uij6xb4foj getstartedlab_redis replicated 1/1 redis:latest *:6379->6379/tcp
|
||||
n5rvhm52ykq7 getstartedlab_visualizer replicated 1/1 dockersamples/visualizer:stable *:8080->8080/tcp
|
||||
mifd433bti1d getstartedlab_web replicated 5/5 orangesnap/getstarted:latest *:80->80/tcp
|
||||
mifd433bti1d getstartedlab_web replicated 5/5 gordon/getstarted:latest *:80->80/tcp
|
||||
|
||||
```
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
<username>---
|
||||
description: Copy files among machines
|
||||
keywords: machine, scp, subcommand
|
||||
title: docker-machine scp
|
||||
|
@ -56,12 +56,12 @@ them. Avoid using relative paths, but specify absolute paths in
|
|||
paths both for the location on the Docker daemon and within the container.
|
||||
|
||||
For example, imagine you want to transfer your local directory
|
||||
`/Users/londoncalling/webapp` to a remote machine and bind mount it into a
|
||||
`/Users/<username>/webapp` to a remote machine and bind mount it into a
|
||||
container on the remote host. If the remote user is `ubuntu`, use a command like
|
||||
this:
|
||||
|
||||
```none
|
||||
$ docker-machine scp -r /Users/londoncalling/webapp MACHINE-NAME:/home/ubuntu/webapp
|
||||
$ docker-machine scp -r /Users/<username>/webapp MACHINE-NAME:/home/ubuntu/webapp
|
||||
```
|
||||
|
||||
Then write a docker-compose file that bind mounts it in:
|
||||
|
|
Loading…
Reference in New Issue