Skip to content

Commit e3ef5c5

Browse files
committed
machine: move overview page to /machine/
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent ce451cb commit e3ef5c5

File tree

9 files changed

+8
-26
lines changed

9 files changed

+8
-26
lines changed

_data/toc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ manuals:
13401340
section:
13411341
- sectiontitle: Docker Machine
13421342
section:
1343-
- path: /machine/overview/
1343+
- path: /machine/
13441344
title: Machine overview
13451345
- path: /machine/install-machine/
13461346
title: Install Machine

compose/django.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,7 @@ In this section, you set up the database connection for Django.
210210
At this point, your Django app should be running at port `8000` on
211211
your Docker host. On Docker Desktop for Mac and Docker Desktop for Windows, go
212212
to `http://localhost:8000` on a web browser to see the Django
213-
welcome page. If you are using [Docker Machine](../machine/overview.md),
214-
then `docker-machine ip MACHINE_VM` returns the Docker host IP
215-
address, to which you can append the port (`<Docker-Host-IP>:8000`).
213+
welcome page.
216214

217215
![Django example](images/django-it-worked.png)
218216

compose/index.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,7 @@ $ docker-compose down
162162
### Single host deployments
163163

164164
Compose has traditionally been focused on development and testing workflows,
165-
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
166-
[Docker Machine](../machine/overview.md) or an entire
167-
[Docker Swarm](../engine/swarm/index.md) cluster.
165+
but with each release we're making progress on more production-oriented features.
168166

169167
For details on using production-oriented features, see
170168
[compose in production](production.md) in this documentation.

compose/production.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,7 @@ recreating any services which `web` depends on.
5656

5757
You can use Compose to deploy an app to a remote Docker host by setting the
5858
`DOCKER_HOST`, `DOCKER_TLS_VERIFY`, and `DOCKER_CERT_PATH` environment variables
59-
appropriately. For tasks like this,
60-
[Docker Machine](../machine/overview.md) makes managing local and
61-
remote Docker hosts very easy, and is recommended even if you're not deploying
62-
remotely.
59+
appropriately.
6360

6461
Once you've set up your environment variables, all the normal `docker-compose`
6562
commands work with no further configuration.

compose/rails.md

-4
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,6 @@ That's it. Your app should now be running on port 3000 on your Docker daemon.
212212
On Docker Desktop for Mac and Docker Desktop for Windows, go to `http://localhost:3000` on a web
213213
browser to see the Rails Welcome.
214214

215-
If you are using [Docker Machine](../machine/overview.md), then `docker-machine ip
216-
MACHINE_VM` returns the Docker host IP address, to which you can append the port
217-
(`<Docker-Host-IP>:3000`).
218-
219215
![Rails example](images/rails-welcome.png)
220216

221217
### Stop the application

docker-for-windows/troubleshoot.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ Here are some steps to take if you experience similar problems:
239239
![Hyper-V manager](images/hyperv-manager.png)
240240

241241
4. Set up an external network switch. If you plan at any point to use
242-
[Docker Machine](../machine/overview.md) to set up multiple local VMs, you
242+
[Docker Machine](../machine/index.md) to set up multiple local VMs, you
243243
need this anyway, as described in the topic on the
244244
[Hyper-V driver for Docker Machine](../machine/drivers/hyper-v.md#example).
245245
You can replace `DockerNAT` with this switch.

engine/swarm/swarm-tutorial/index.md

+1-8
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,7 @@ serve as the single swarm node.
8080
<p />
8181

8282
* Currently, you cannot use Docker Desktop for Mac or Docker Desktop for Windows alone to test a
83-
_multi-node_ swarm. However, you can use the included version of
84-
[Docker Machine](../../../machine/overview.md) to create the swarm nodes (see
85-
[Get started with Docker Machine and a local VM](../../../machine/get-started.md)), then
86-
follow the tutorial for all multi-node features. For this scenario, you run
87-
commands from a Docker Desktop for Mac or Docker Desktop for Windows host, but that Docker host itself is
88-
_not_ participating in the swarm. After you create the nodes, you can run all
89-
swarm commands as shown from the Mac terminal or Windows PowerShell with
90-
Docker Desktop for Mac or Docker Desktop for Windows running.
83+
_multi-node_ swarm, but many examples are applicable to a single-node Swarm setup.
9184

9285
### The IP address of the manager machine
9386

machine/overview.md renamed to machine/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Introduction and Overview of Machine
33
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
44
title: Docker Machine overview
55
redirect_from:
6-
- /machine/
6+
- /machine/overview/
77
---
88

99
You can use Docker Machine to:

machine/install-machine.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ servers.
121121

122122
## Where to go next
123123

124-
- [Docker Machine overview](overview.md)
124+
- [Docker Machine overview](index.md)
125125
- Create and run a Docker host on your [local system using virtualization](get-started.md)
126126
- Provision multiple Docker hosts [on your cloud provider](get-started-cloud.md)
127127
- [Docker Machine driver reference](drivers/index.md)

0 commit comments

Comments
 (0)