mirror of https://github.com/docker/docs.git
Remove Docker machine from toc, update other references
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
This commit is contained in:
Usha Mandya
parent
2dc8b49dcb
commit
0417b58c87
106
_data/toc.yaml
106
_data/toc.yaml
|
|
@ -1458,110 +1458,8 @@ manuals:
|
|||
title: Release notes
|
||||
- sectiontitle: Superseded products and tools
|
||||
section:
|
||||
- sectiontitle: Docker Machine
|
||||
section:
|
||||
- path: /machine/
|
||||
title: Machine overview
|
||||
- path: /machine/install-machine/
|
||||
title: Install Machine
|
||||
- path: /machine/release-notes/
|
||||
title: Release notes
|
||||
- path: /machine/get-started/
|
||||
title: Get started with a local VM
|
||||
- path: /machine/get-started-cloud/
|
||||
title: Provision hosts in the cloud
|
||||
- sectiontitle: Learn by example
|
||||
section:
|
||||
- path: /machine/examples/ocean/
|
||||
title: Provision Digital Ocean Droplets
|
||||
- path: /machine/examples/aws/
|
||||
title: Provision AWS EC2 instances
|
||||
- path: /machine/concepts/
|
||||
title: Machine concepts and help
|
||||
- sectiontitle: Machine (docker-machine) CLI
|
||||
section:
|
||||
- path: /machine/reference/
|
||||
title: Machine CLI overview
|
||||
- path: /machine/completion/
|
||||
title: Machine command-line completion
|
||||
- path: /machine/reference/active/
|
||||
title: active
|
||||
- path: /machine/reference/config/
|
||||
title: config
|
||||
- path: /machine/reference/create/
|
||||
title: create
|
||||
- path: /machine/reference/env/
|
||||
title: env
|
||||
- path: /machine/reference/help/
|
||||
title: help
|
||||
- path: /machine/reference/inspect/
|
||||
title: inspect
|
||||
- path: /machine/reference/ip/
|
||||
title: ip
|
||||
- path: /machine/reference/kill/
|
||||
title: kill
|
||||
- path: /machine/reference/ls/
|
||||
title: ls
|
||||
- path: /machine/reference/mount/
|
||||
title: mount
|
||||
- path: /machine/reference/provision/
|
||||
title: provision
|
||||
- path: /machine/reference/regenerate-certs/
|
||||
title: regenerate-certs
|
||||
- path: /machine/reference/restart/
|
||||
title: restart
|
||||
- path: /machine/reference/rm/
|
||||
title: rm
|
||||
- path: /machine/reference/scp/
|
||||
title: scp
|
||||
- path: /machine/reference/ssh/
|
||||
title: ssh
|
||||
- path: /machine/reference/start/
|
||||
title: start
|
||||
- path: /machine/reference/status/
|
||||
title: status
|
||||
- path: /machine/reference/stop/
|
||||
title: stop
|
||||
- path: /machine/reference/upgrade/
|
||||
title: upgrade
|
||||
- path: /machine/reference/url/
|
||||
title: url
|
||||
- sectiontitle: Machine drivers
|
||||
section:
|
||||
- path: /machine/drivers/
|
||||
title: Drivers overview
|
||||
- path: /machine/drivers/os-base/
|
||||
title: Driver options and operating system defaults
|
||||
- path: /machine/drivers/aws/
|
||||
title: Amazon Web Services
|
||||
- path: /machine/drivers/digital-ocean/
|
||||
title: Digital Ocean
|
||||
- path: /machine/drivers/exoscale/
|
||||
title: Exoscale
|
||||
- path: /machine/drivers/generic/
|
||||
title: Generic
|
||||
- path: /machine/drivers/gce/
|
||||
title: Google Compute Engine
|
||||
- path: /machine/drivers/soft-layer/
|
||||
title: IBM Softlayer
|
||||
- path: /machine/drivers/azure/
|
||||
title: Microsoft Azure
|
||||
- path: /machine/drivers/hyper-v/
|
||||
title: Microsoft Hyper-V
|
||||
- path: /machine/drivers/openstack/
|
||||
title: OpenStack
|
||||
- path: /machine/drivers/virtualbox/
|
||||
title: Oracle VirtualBox
|
||||
- path: /machine/drivers/rackspace/
|
||||
title: Rackspace
|
||||
- path: /machine/drivers/vm-fusion/
|
||||
title: VMware Fusion
|
||||
- path: /machine/drivers/vm-cloud/
|
||||
title: VMware vCloud Air
|
||||
- path: /machine/drivers/vsphere/
|
||||
title: VMware vSphere
|
||||
- path: /machine/migrate-to-machine/
|
||||
title: Migrate from Boot2Docker to Machine
|
||||
- path: /machine/
|
||||
title: Docker Machine (deprecated)
|
||||
- path: /toolbox/
|
||||
title: Docker Toolbox (deprecated)
|
||||
- path: /kitematic/
|
||||
|
|
|
|||
|
|
@ -253,8 +253,7 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install
|
|||
* Run the uninstall commands from the menu.
|
||||
|
||||
* If `docker` commands aren't working properly or as expected, you may need to
|
||||
unset some environment variables, to make sure you are not using the legacy
|
||||
Docker Machine environment in your shell or command window. Unset the
|
||||
unset some environment variables, to make sure you are not using the deprecated Docker Machine environment in your shell or command window. Unset the
|
||||
`DOCKER_HOST` environment variable and related variables. If you use bash, use the following command: `unset ${!DOCKER_*}`
|
||||
|
||||
* For the `hello-world-nginx` example, Docker Desktop must be running to get to
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ To run this tutorial, you need the following:
|
|||
|
||||
This tutorial requires three Linux hosts which have Docker installed and can
|
||||
communicate over a network. These can be physical machines, virtual machines,
|
||||
Amazon EC2 instances, or hosted in some other way. You can even use Docker Machine
|
||||
from a Linux, Mac, or Windows host. Check out
|
||||
Amazon EC2 instances, or hosted in some other way. Check out
|
||||
[Getting started - Swarms](../../../get-started/swarm-deploy.md#prerequisites)
|
||||
for one possible set-up for the hosts.
|
||||
|
||||
|
|
@ -58,8 +57,7 @@ single-node and multi-node swarm scenarios on Linux machines.
|
|||
|
||||
Alternatively, install the latest [Docker Desktop for Mac](../../../desktop/mac/index.md) or
|
||||
[Docker Desktop for Windows](../../../desktop/windows/index.md) application on one
|
||||
computer. You can test both single-node and multi-node swarm from this computer,
|
||||
but you need to use Docker Machine to test the multi-node scenarios.
|
||||
computer. You can test both single-node and multi-node swarm from this computer.
|
||||
|
||||
* You can use Docker Desktop for Mac or Windows to test _single-node_ features
|
||||
of swarm mode, including initializing a swarm with a single node, creating
|
||||
|
|
@ -80,10 +78,6 @@ fixed IP address.
|
|||
You can run `ifconfig` on Linux or macOS to see a list of the
|
||||
available network interfaces.
|
||||
|
||||
If you are using Docker Machine, you can get the manager IP with either
|
||||
`docker-machine ls` or `docker-machine ip <MACHINE-NAME>` — for example,
|
||||
`docker-machine ip manager1`.
|
||||
|
||||
The tutorial uses `manager1` : `192.168.99.100`.
|
||||
|
||||
### Open protocols and ports between the hosts
|
||||
|
|
|
|||
|
|
@ -4,13 +4,66 @@ keywords: docker, machine
|
|||
title: Docker Machine
|
||||
redirect_from:
|
||||
- /machine/overview/
|
||||
- /machine/AVAILABLE_DRIVER_PLUGINS/
|
||||
- /machine/DRIVER_SPEC/
|
||||
- /machine/RELEASE/
|
||||
- /machine/completion/
|
||||
- /machine/concepts/
|
||||
- /machine/drivers/aws/
|
||||
- /machine/drivers/azure/
|
||||
- /machine/drivers/digital-ocean/
|
||||
- /machine/drivers/exoscale/
|
||||
- /machine/drivers/gce/
|
||||
- /machine/drivers/generic/
|
||||
- /machine/drivers/hyper-v/
|
||||
- /machine/drivers/index/
|
||||
- /machine/drivers/linode/
|
||||
- /machine/drivers/openstack/
|
||||
- /machine/drivers/os-base/
|
||||
- /machine/drivers/rackspace/
|
||||
- /machine/drivers/soft-layer/
|
||||
- /machine/drivers/virtualbox/
|
||||
- /machine/drivers/vm-cloud/
|
||||
- /machine/drivers/vm-fusion/
|
||||
- /machine/drivers/vsphere/
|
||||
- /machine/examples/aws/
|
||||
- /machine/examples/index/
|
||||
- /machine/examples/ocean/
|
||||
- /machine/get-started-cloud/
|
||||
- /machine/get-started/
|
||||
- /machine/install-machine/
|
||||
- /machine/migrate-to-machine/
|
||||
- /machine/reference/active/
|
||||
- /machine/reference/config/
|
||||
- /machine/reference/create/
|
||||
- /machine/reference/env/
|
||||
- /machine/reference/help/
|
||||
- /machine/reference/index/
|
||||
- /machine/reference/inspect/
|
||||
- /machine/reference/ip/
|
||||
- /machine/reference/kill/
|
||||
- /machine/reference/ls/
|
||||
- /machine/reference/mount/
|
||||
- /machine/reference/provision/
|
||||
- /machine/reference/regenerate-certs/
|
||||
- /machine/reference/restart/
|
||||
- /machine/reference/rm/
|
||||
- /machine/reference/scp/
|
||||
- /machine/reference/ssh/
|
||||
- /machine/reference/start/
|
||||
- /machine/reference/status/
|
||||
- /machine/reference/stop/
|
||||
- /machine/reference/upgrade/
|
||||
- /machine/reference/url/
|
||||
- /machine/release-notes/
|
||||
notoc: true
|
||||
---
|
||||
|
||||
> **Deprecated**
|
||||
>
|
||||
> Docker Machine has been deprecated. Please use Docker Desktop instead, see [Docker Desktop](../desktop/),
|
||||
> or use other cloud provisioning tools.
|
||||
> Docker Machine has been deprecated. Please use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/mac/index.md)
|
||||
> and [Docker Desktop for Windows](../desktop/windows/index.md).
|
||||
> You can also use other cloud provisioning tools.
|
||||
{: .warning }
|
||||
|
||||
The source code for Docker Machine has been archived, but [can be found on GitHub](https://github.com/docker/machine){:target="_blank" rel="noopener" class="_"}.
|
||||
The source code for Docker Machine has been archived. You can find the source code on [GitHub](https://github.com/docker/machine){:target="_blank" rel="noopener" class="_"}.
|
||||
|
|
|
|||
|
|
@ -125,10 +125,6 @@ administrator.
|
|||
because the containers are still being initialized and may take a couple of
|
||||
minutes before the first load.
|
||||
|
||||
If you are using [Docker Machine](../machine/index.md), you can run the command
|
||||
`docker-machine ip MACHINE_VM` to get the machine address, and then open
|
||||
`http://MACHINE_VM_IP:8000` in a web browser.
|
||||
|
||||
If you are using Docker Desktop for Mac or Docker Desktop for Windows, you can use
|
||||
`http://localhost` as the IP address, and open `http://localhost:8000` in a web
|
||||
browser.
|
||||
|
|
|
|||
|
|
@ -38,10 +38,7 @@ data.
|
|||
Removing Toolbox involves removing all the Docker components it includes.
|
||||
|
||||
A full uninstall also includes removing the local and remote machines
|
||||
you created with Docker Machine. In some cases, you might want to keep
|
||||
machines created with Docker Machine. For example, if you plan to re-install
|
||||
Docker Machine as a part of Docker Desktop, you can continue to manage those
|
||||
machines through Docker. Or, if you have remote machines on a cloud provider and
|
||||
you created with Docker Machine. If you have remote machines on a cloud provider and
|
||||
you plan to manage them using the provider, you wouldn't want to remove
|
||||
them. So, the step to remove machines is described here as optional.
|
||||
|
||||
|
|
@ -66,11 +63,6 @@ To uninstall Docker Toolbox on Mac:
|
|||
Successfully removed my-docker-machine
|
||||
```
|
||||
|
||||
This step is optional because if you plan
|
||||
to re-install Docker Machine as a part
|
||||
of [Docker Desktop for Mac](../desktop/mac/index.md), you can import and
|
||||
continue to manage those machines through Docker.
|
||||
|
||||
3. In your "Applications" folder, remove the "Docker" directory,
|
||||
which contains "Docker Quickstart Terminal" and "Kitematic".
|
||||
|
||||
|
|
@ -113,17 +105,13 @@ To uninstall Toolbox on Windows:
|
|||
default virtualbox Stopped
|
||||
```
|
||||
|
||||
2. Optionally, remove each machine. For example:
|
||||
2. Remove each machine. For example:
|
||||
|
||||
```console
|
||||
$ docker-machine rm my-docker-machine
|
||||
Successfully removed my-docker-machine
|
||||
```
|
||||
|
||||
This step is optional because if you plan to re-install Docker Machine as a
|
||||
part of [Docker Desktop for Windows](../desktop/windows/index.md), you can
|
||||
import and continue to manage those machines through Docker.
|
||||
|
||||
3. Uninstall Docker Toolbox using Window's standard process for uninstalling programs through the control panel (programs and features).
|
||||
|
||||
>**Note**: This process does not remove the `docker-install.exe` file. You must delete that file yourself.
|
||||
|
|
|
|||
Loading…
Reference in New Issue