mirror of https://github.com/docker/docs.git
machine: move overview page to /machine/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
ce451cba54
commit
e3ef5c5085
|
@ -1340,7 +1340,7 @@ manuals:
|
|||
section:
|
||||
- sectiontitle: Docker Machine
|
||||
section:
|
||||
- path: /machine/overview/
|
||||
- path: /machine/
|
||||
title: Machine overview
|
||||
- path: /machine/install-machine/
|
||||
title: Install Machine
|
||||
|
|
|
@ -210,9 +210,7 @@ In this section, you set up the database connection for Django.
|
|||
At this point, your Django app should be running at port `8000` on
|
||||
your Docker host. On Docker Desktop for Mac and Docker Desktop for Windows, go
|
||||
to `http://localhost:8000` on a web browser to see the Django
|
||||
welcome page. If you are using [Docker Machine](../machine/overview.md),
|
||||
then `docker-machine ip MACHINE_VM` returns the Docker host IP
|
||||
address, to which you can append the port (`<Docker-Host-IP>:8000`).
|
||||
welcome page.
|
||||
|
||||

|
||||
|
||||
|
|
|
@ -162,9 +162,7 @@ $ docker-compose down
|
|||
### Single host deployments
|
||||
|
||||
Compose has traditionally been focused on development and testing workflows,
|
||||
but with each release we're making progress on more production-oriented features. You can use Compose to deploy to a remote Docker Engine. The Docker Engine may be a single instance provisioned with
|
||||
[Docker Machine](../machine/overview.md) or an entire
|
||||
[Docker Swarm](../engine/swarm/index.md) cluster.
|
||||
but with each release we're making progress on more production-oriented features.
|
||||
|
||||
For details on using production-oriented features, see
|
||||
[compose in production](production.md) in this documentation.
|
||||
|
|
|
@ -56,10 +56,7 @@ recreating any services which `web` depends on.
|
|||
|
||||
You can use Compose to deploy an app to a remote Docker host by setting the
|
||||
`DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables
|
||||
appropriately. For tasks like this,
|
||||
[Docker Machine](../machine/overview.md) makes managing local and
|
||||
remote Docker hosts very easy, and is recommended even if you're not deploying
|
||||
remotely.
|
||||
appropriately.
|
||||
|
||||
Once you've set up your environment variables, all the normal `docker-compose`
|
||||
commands work with no further configuration.
|
||||
|
|
|
@ -212,10 +212,6 @@ That's it. Your app should now be running on port 3000 on your Docker daemon.
|
|||
On Docker Desktop for Mac and Docker Desktop for Windows, go to `http://localhost:3000` on a web
|
||||
browser to see the Rails Welcome.
|
||||
|
||||
If you are using [Docker Machine](../machine/overview.md), then `docker-machine ip
|
||||
MACHINE_VM` returns the Docker host IP address, to which you can append the port
|
||||
(`<Docker-Host-IP>:3000`).
|
||||
|
||||

|
||||
|
||||
### Stop the application
|
||||
|
|
|
@ -239,7 +239,7 @@ Here are some steps to take if you experience similar problems:
|
|||

|
||||
|
||||
4. Set up an external network switch. If you plan at any point to use
|
||||
[Docker Machine](../machine/overview.md) to set up multiple local VMs, you
|
||||
[Docker Machine](../machine/index.md) to set up multiple local VMs, you
|
||||
need this anyway, as described in the topic on the
|
||||
[Hyper-V driver for Docker Machine](../machine/drivers/hyper-v.md#example).
|
||||
You can replace `DockerNAT` with this switch.
|
||||
|
|
|
@ -80,14 +80,7 @@ serve as the single swarm node.
|
|||
<p />
|
||||
|
||||
* Currently, you cannot use Docker Desktop for Mac or Docker Desktop for Windows alone to test a
|
||||
_multi-node_ swarm. However, you can use the included version of
|
||||
[Docker Machine](../../../machine/overview.md) to create the swarm nodes (see
|
||||
[Get started with Docker Machine and a local VM](../../../machine/get-started.md)), then
|
||||
follow the tutorial for all multi-node features. For this scenario, you run
|
||||
commands from a Docker Desktop for Mac or Docker Desktop for Windows host, but that Docker host itself is
|
||||
_not_ participating in the swarm. After you create the nodes, you can run all
|
||||
swarm commands as shown from the Mac terminal or Windows PowerShell with
|
||||
Docker Desktop for Mac or Docker Desktop for Windows running.
|
||||
_multi-node_ swarm, but many examples are applicable to a single-node Swarm setup.
|
||||
|
||||
### The IP address of the manager machine
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ description: Introduction and Overview of Machine
|
|||
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
|
||||
title: Docker Machine overview
|
||||
redirect_from:
|
||||
- /machine/
|
||||
- /machine/overview/
|
||||
---
|
||||
|
||||
You can use Docker Machine to:
|
|
@ -121,7 +121,7 @@ servers.
|
|||
|
||||
## Where to go next
|
||||
|
||||
- [Docker Machine overview](overview.md)
|
||||
- [Docker Machine overview](index.md)
|
||||
- Create and run a Docker host on your [local system using virtualization](get-started.md)
|
||||
- Provision multiple Docker hosts [on your cloud provider](get-started-cloud.md)
|
||||
- [Docker Machine driver reference](drivers/index.md)
|
||||
|
|
Loading…
Reference in New Issue