Skip to content

Commit 7bef7e5

Browse files
author
paigehargrave
authored
Update get-started.md
1 parent e872839 commit 7bef7e5

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

machine/get-started.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ Docker host inside of a local virtual machine.
99

1010
## Prerequisite Information
1111

12-
With the advent of [Docker for Mac](/docker-for-mac/index.md) and [Docker for
12+
With the advent of [Docker Desktop for Mac](/docker-for-mac/index.md) and [Docker Desktop for
1313
Windows](/docker-for-windows/index.md) as replacements for [Docker
1414
Toolbox](/toolbox/overview.md), we recommend that you use these for your primary
1515
Docker workflows. You can use these applications to run Docker natively on your
16-
local system without using Docker Machine at all. (See [Docker for Mac vs.
16+
local system without using Docker Machine at all. (See [Docker Desktop for Mac vs.
1717
Docker Toolbox](/docker-for-mac/docker-toolbox.md) for an explanation on the Mac
1818
side.)
1919

2020
For now, however, if you want to create _multiple_ local machines, you still
2121
need Docker Machine to create and manage machines for multi-node
22-
experimentation. Both Docker for Mac and Docker for Windows include the newest
22+
experimentation. Both Docker Desktop for Mac and Docker Desktop for Windows include the newest
2323
version of Docker Machine, so when you install either of these, you get
2424
`docker-machine`.
2525

2626
The new solutions come with their own native virtualization solutions rather
2727
than Oracle VirtualBox, so keep the following considerations in mind when using
2828
Machine to create local VMs.
2929

30-
* **Docker for Mac** - You can use `docker-machine create` with the `virtualbox` driver to create additional local machines.
30+
* **Docker Desktop for Mac** - You can use `docker-machine create` with the `virtualbox` driver to create additional local machines.
3131

32-
* **Docker for Windows** - You can use `docker-machine create` with the `hyperv` driver to create additional local machines.
32+
* **Docker Desktop for Windows** - You can use `docker-machine create` with the `hyperv` driver to create additional local machines.
3333

34-
#### If you are using Docker for Windows
34+
#### If you are using Docker Desktop for Windows
3535

36-
Docker for Windows uses [Microsoft
36+
Docker Desktop for Windows uses [Microsoft
3737
Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/windows_welcome)
3838
for virtualization, and Hyper-V is not compatible with Oracle VirtualBox.
3939
Therefore, you cannot run the two solutions simultaneously. But you can still
@@ -42,31 +42,31 @@ driver.
4242

4343
The prerequisites are:
4444

45-
* Have Docker for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker for Windows](/docker-for-windows/install.md#what-to-know-before-you-install)).
45+
* Have Docker Desktop for Windows installed, and running (which requires that virtualization and Hyper-V are enabled, as described in [What to know before you install Docker Desktop for Windows](/docker-for-windows/install.md#what-to-know-before-you-install)).
4646

4747
* Set up the Hyper-V driver to use an external virtual network switch See
4848
the [Docker Machine driver for Microsoft Hyper-V](drivers/hyper-v.md) topic,
4949
which includes an [example](/machine/drivers/hyper-v.md#example) of how to do this.
5050

51-
#### If you are using Docker for Mac
51+
#### If you are using Docker Desktop for Mac
5252

53-
Docker for Mac uses [HyperKit](https://github.com/docker/HyperKit/), a
53+
Docker Desktop for Mac uses [HyperKit](https://github.com/docker/HyperKit/), a
5454
lightweight macOS virtualization solution built on top of the
5555
[Hypervisor.framework](https://developer.apple.com/reference/hypervisor).
5656

5757
Currently, there is no `docker-machine create` driver for HyperKit, so
5858
use the `virtualbox` driver to create local machines. (See the [Docker Machine
5959
driver for Oracle VirtualBox](drivers/virtualbox.md).) You can run
6060
both HyperKit and Oracle VirtualBox on the same system. To learn more, see
61-
[Docker for Mac vs. Docker Toolbox](/docker-for-mac/docker-toolbox/).
61+
[Docker Desktop for Mac vs. Docker Toolbox](/docker-for-mac/docker-toolbox/).
6262

6363
* Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"}
6464
correctly installed on your system (either as part of an earlier Toolbox install,
6565
or manual install).
6666

6767
#### If you are using Docker Toolbox
6868

69-
Docker for Mac and Docker for Windows both require newer versions of their
69+
Docker Desktop for Mac and Docker Desktop for Windows both require newer versions of their
7070
respective operating systems, so users with older OS versions must use Docker
7171
Toolbox.
7272

@@ -75,14 +75,14 @@ machine based on Oracle [VirtualBox](https://www.virtualbox.org/){:
7575
target="_blank" class="_"}. (See the [Docker Machine driver for Oracle
7676
VirtualBox](drivers/virtualbox.md).)
7777

78-
* If you are using Docker Toolbox on a Windows system that has Hyper-V but cannot run Docker for Windows (for example Windows 8 Pro), you must use the
78+
* If you are using Docker Toolbox on a Windows system that has Hyper-V but cannot run Docker Desktop for Windows (for example Windows 8 Pro), you must use the
7979
`hyperv` driver to create local machines. (See the [Docker Machine driver for
8080
Microsoft Hyper-V](drivers/hyper-v.md).)
8181

8282
* Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" class="_"}
8383
correctly installed on your system. If you used
8484
[Toolbox](https://www.docker.com/products/docker-toolbox){: target="_blank" class="_"}
85-
or [Docker for Windows](/docker-for-windows/index.md){: target="_blank" class="_"}
85+
or [Docker Desktop for Windows](/docker-for-windows/index.md){: target="_blank" class="_"}
8686
to install Docker Machine, VirtualBox is
8787
automatically installed.
8888

@@ -123,9 +123,9 @@ The examples here show how to create and start a machine, run Docker commands, a
123123
it `default` as shown in the example. If you already have a "default" machine,
124124
choose another name for this new machine.
125125

126-
* If you are using Toolbox on Mac, Toolbox on older Windows systems without Hyper-V, or Docker for Mac, use `virtualbox` as the driver, as shown in this example. (The Docker Machine VirtualBox driver reference is [here](drivers/virtualbox.md).) (See [prerequisites](get-started.md#prerequisite-information) above to learn more.)
126+
* If you are using Toolbox on Mac, Toolbox on older Windows systems without Hyper-V, or Docker Desktop for Mac, use `virtualbox` as the driver, as shown in this example. (The Docker Machine VirtualBox driver reference is [here](drivers/virtualbox.md).) (See [prerequisites](get-started.md#prerequisite-information) above to learn more.)
127127

128-
* On Docker for Windows systems that support Hyper-V, use the `hyperv` driver as shown in the [Docker Machine Microsoft Hyper-V driver reference](drivers/hyper-v.md) and follow the [example](/machine/drivers/hyper-v.md#example), which shows how to use an external network switch and provides the flags for the full command. (See [prerequisites](get-started.md#prerequisite-information) above to learn more.)
128+
* On Docker Desktop for Windows systems that support Hyper-V, use the `hyperv` driver as shown in the [Docker Machine Microsoft Hyper-V driver reference](drivers/hyper-v.md) and follow the [example](/machine/drivers/hyper-v.md#example), which shows how to use an external network switch and provides the flags for the full command. (See [prerequisites](get-started.md#prerequisite-information) above to learn more.)
129129

130130
$ docker-machine create --driver virtualbox default
131131
Running pre-create checks...
@@ -290,7 +290,7 @@ For machines other than `default`, and commands other than those listed above, y
290290
## Unset environment variables in the current shell
291291

292292
You might want to use the current shell to connect to a different Docker Engine.
293-
This would be the case if, for example, you are [running Docker for Mac
293+
This would be the case if, for example, you are [running Docker Desktop for Mac
294294
concurrent with Docker Toolbox](/docker-for-mac/docker-toolbox.md) and want to
295295
talk to two different Docker Engines.
296296
In both scenarios, you have the option to switch the environment for the current
@@ -339,12 +339,12 @@ shell to talk to different Docker engines.
339339
$ env | grep DOCKER
340340
```
341341
342-
If you are running Docker for Mac, you can run Docker commands to talk
342+
If you are running Docker Desktop for Mac, you can run Docker commands to talk
343343
to the Docker Engine installed with that app.
344344
345-
Since [Docker for Windows is incompatible with
345+
Since [Docker Desktop for Windows is incompatible with
346346
Toolbox](/docker-for-windows/install.md#what-to-know-before-you-install),
347-
this scenario isn't applicable because Docker for Windows uses the Docker
347+
this scenario isn't applicable because Docker Desktop for Windows uses the Docker
348348
Engine and Docker Machine that come with it.
349349
350350
## Start local machines on startup

0 commit comments

Comments
 (0)