Merge pull request #12289 from usha-mandya/12243-patch

Remove Desktop install references
This commit is contained in:
Usha Mandya 2021-02-09 16:59:35 +00:00 committed by GitHub
commit 17507f0dee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions

View File

@ -7,6 +7,11 @@ title: Get started with Docker Machine and a local VM
Let's take a look at using `docker-machine` to create, use, and manage a Let's take a look at using `docker-machine` to create, use, and manage a
Docker host inside of a local virtual machine. Docker host inside of a local virtual machine.
> **Note**
>
> Docker Machine is no longer included in the Docker Desktop installer. You can download it separately from the [docker/machine](https://github.com/docker/machine/releases/){: target="_blank" rel="noopener" class="_" } release
page on GitHub.
## Prerequisite information ## Prerequisite information
With the advent of [Docker Desktop for Mac](../docker-for-mac/index.md) and With the advent of [Docker Desktop for Mac](../docker-for-mac/index.md) and
@ -16,9 +21,7 @@ on your local system without using Docker Machine at all.
For now, however, if you want to create _multiple_ local machines, you still For now, however, if you want to create _multiple_ local machines, you still
need Docker Machine to create and manage machines for multi-node need Docker Machine to create and manage machines for multi-node
experimentation. Both Docker Desktop for Mac and Docker Desktop for Windows include the newest experimentation.
version of Docker Machine, so when you install either of these, you get
`docker-machine`.
The new solutions come with their own native virtualization solutions rather The new solutions come with their own native virtualization solutions rather
than Oracle VirtualBox, so keep the following considerations in mind when using than Oracle VirtualBox, so keep the following considerations in mind when using

View File

@ -33,8 +33,7 @@ v1.12. Starting with the beta program and Docker v1.12,
[Docker Desktop for Mac](../docker-for-mac/index.md) and [Docker Desktop for Mac](../docker-for-mac/index.md) and
[Docker Desktop for Windows](../docker-for-windows/index.md) are available as native apps and the [Docker Desktop for Windows](../docker-for-windows/index.md) are available as native apps and the
better choice for this use case on newer desktops and laptops. We encourage you better choice for this use case on newer desktops and laptops. We encourage you
to try out these new apps. The installers for Docker Desktop for Mac and Docker Desktop for to try out these new apps.
Windows include Docker Machine, along with Docker Compose.
If you aren't sure where to begin, see [Get Started with Docker](../get-started/index.md), If you aren't sure where to begin, see [Get Started with Docker](../get-started/index.md),
which guides you through a brief end-to-end tutorial on Docker. which guides you through a brief end-to-end tutorial on Docker.