diff --git a/_data/advisories.yaml b/_data/advisories.yaml index 1011b4518c..01524ecb17 100644 --- a/_data/advisories.yaml +++ b/_data/advisories.yaml @@ -12,7 +12,7 @@ texts: rc: "The Swarm mode feature included in Docker Engine 1.12 is a release candidate feature and might be subject to non backward-compatible changes. Some functionality may change before the feature becomes generally available." docker4mac-beta: "Docker Desktop for Mac is currently in public beta. Some functionality may change before the product becomes generally available." docker4win-beta: "Docker Desktop for Windows is currently in public beta. Some functionality may change before the product becomes generally available." - toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker Desktop for Mac](/docker-for-mac/) and [Docker Desktop for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible." + toolbox: "**Deprecated:** Docker Toolbox has been deprecated and is no longer in active development. Please use Docker Desktop instead. See [Docker Desktop for Mac](/docker-for-mac/) and [Docker Desktop for Windows](/docker-for-windows/)." kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker Desktop for Mac](/docker-for-mac/) or [Docker Desktop for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications." swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product." swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/#swarm-mode-cli-commands), and the [Get started with Docker walkthrough](/get-started/)). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands." diff --git a/_data/glossary.yaml b/_data/glossary.yaml index 4f21178353..0119bc7213 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -8,11 +8,6 @@ aufs: | base image: | A **base image** has no parent image specified in its Dockerfile. It is created using a Dockerfile with the `FROM scratch` directive. -boot2docker: | - [boot2docker](http://boot2docker.io/) is a lightweight Linux distribution made - specifically to run Docker containers. The boot2docker management tool for Mac - and Windows was deprecated and replaced by [`docker-machine`](#machine) which - you can install with the Docker Toolbox. btrfs: | btrfs (B-tree file system) is a Linux [filesystem](#filesystem) that Docker supports as a storage backend. It is a [copy-on-write](http://en.wikipedia.org/wiki/Copy-on-write) @@ -81,8 +76,7 @@ Docker Desktop for Mac: | Mac application, Docker Desktop for Mac uses the macOS Hypervisor framework, networking, and filesystem. It's the best solution if you want to build, debug, test, package, and ship Dockerized applications on a - Mac. Docker Desktop for Mac supersedes [Docker Toolbox](#toolbox) as - state-of-the-art Docker on macOS. + Mac. Docker Desktop for Windows: | [Docker Desktop for Windows](/docker-for-windows/) is an easy-to-install, lightweight Docker development environment designed @@ -92,8 +86,7 @@ Docker Desktop for Windows: | 2016, and gives you the ability to set up and run Windows containers as well as the standard Linux containers, with an option to switch between the two. Docker for Windows is the best solution if you want to build, debug, test, package, and - ship Dockerized applications from Windows machines. Docker Desktop for Windows - supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker on Windows. + ship Dockerized applications from Windows machines. Docker Hub: | The [Docker Hub](https://hub.docker.com/) is a centralized resource for working with Docker and its components. It provides the following services: @@ -150,11 +143,6 @@ image: | execution parameters for use within a container runtime. An image typically contains a union of layered filesystems stacked on top of each other. An image does not have state and it never changes. -Kitematic: | - A legacy GUI, bundled with [Docker Toolbox](#toolbox), for managing Docker - containers. We recommend upgrading to [Docker Desktop for Mac](#docker_desktop_for_mac) - or [Docker Desktop for Windows](#docker_desktop_for_windows), which have - superseded Kitematic. layer: | In an image, a layer is modification to the image, represented by an instruction in the Dockerfile. Layers are applied in sequence to the base image to create the final image. @@ -283,17 +271,6 @@ task: | containers. ![services diagram](/engine/swarm/images/services-diagram.png) -Toolbox: | - [Docker Toolbox](/toolbox/overview/) is a legacy - installer for Mac and Windows users. It uses Oracle VirtualBox for - virtualization. - - For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker Desktop for - Mac](/docker-for-mac/) is the better solution. - - For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise - and Education), [Docker Desktop for - Windows](/docker-for-windows/) is the better solution. Union file system: | Union file systems implement a [union mount](https://en.wikipedia.org/wiki/Union_mount) and operate by creating diff --git a/_data/toc.yaml b/_data/toc.yaml index 580fc48550..fb3b1511d0 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1154,8 +1154,6 @@ manuals: title: User manual - path: /docker-for-mac/kubernetes/ title: Deploy on Kubernetes - - path: /docker-for-mac/docker-toolbox/ - title: Docker Desktop for Mac vs. Docker Toolbox - path: /docker-for-mac/multi-arch/ title: Leveraging Multi-CPU architecture support - path: /docker-for-mac/networking/ @@ -1182,8 +1180,6 @@ manuals: title: Deploy on Kubernetes - path: /docker-for-windows/networking/ title: Networking - - path: /docker-for-windows/docker-toolbox/ - title: Migrate Docker Toolbox - path: /docker-for-windows/troubleshoot/ title: Logs and troubleshooting - path: /docker-for-windows/faqs/ @@ -1446,14 +1442,8 @@ manuals: title: VMware vSphere - path: /machine/migrate-to-machine/ title: Migrate from Boot2Docker to Machine - - sectiontitle: Docker Toolbox (legacy) - section: - - path: /toolbox/overview/ - title: Toolbox overview - - path: /toolbox/toolbox_install_mac/ - title: Install Toolbox on Mac - - path: /toolbox/toolbox_install_windows/ - title: Install Toolbox on Windows + - path: /docker-for-windows/docker-toolbox/ + title: Docker Toolbox (deprecated) - sectiontitle: Kitematic section: - path: /kitematic/userguide/ diff --git a/compose/install.md b/compose/install.md index 80769dd852..776899ec77 100644 --- a/compose/install.md +++ b/compose/install.md @@ -51,24 +51,18 @@ Python package manager or installing Compose as a container. ### Install Compose on macOS -**Docker Desktop for Mac** and **Docker Toolbox** already include Compose along +**Docker Desktop for Mac** includes Compose along with other Docker apps, so Mac users do not need to install Compose separately. -Docker install instructions for these are here: - - * [Get Docker Desktop for Mac](../docker-for-mac/install.md) - * [Get Docker Toolbox](../toolbox/overview.md) (for older systems) +For installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md).
### Install Compose on Windows desktop systems -**Docker Desktop for Windows** and **Docker Toolbox** already include Compose +**Docker Desktop for Windows** includes Compose along with other Docker apps, so most Windows users do not need to -install Compose separately. Docker install instructions for these are here: - -* [Get Docker Desktop for Windows](../docker-for-windows/install.md) -* [Get Docker Toolbox](../toolbox/overview.md) (for older systems) +install Compose separately. For install instructions, see [Install Docker Desktop on Windows](../docker-for-windows/install.md). If you are running the Docker daemon and client directly on Microsoft Windows Server, follow the instructions in the Windows Server tab. diff --git a/compose/reference/envvars.md b/compose/reference/envvars.md index 387b49c393..1d7fd2525b 100644 --- a/compose/reference/envvars.md +++ b/compose/reference/envvars.md @@ -83,7 +83,7 @@ Supported values are: `TLSv1`, `TLSv1_1`, `TLSv1_2`. ## COMPOSE\_CONVERT\_WINDOWS\_PATHS Enable path conversion from Windows-style to Unix-style in volume definitions. -Users of Docker Machine and Docker Toolbox on Windows should always set this. Defaults to `0`. +Users of Docker Machine on Windows should always set this. Defaults to `0`. Supported values: `true` or `1` to enable, `false` or `0` to disable. ## COMPOSE\_PATH\_SEPARATOR diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 5d66c05951..246d8835dc 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -14,6 +14,7 @@ redirect_from: - /mackit/getting-started/ - /docker-for-mac/osxfs/ - /docker-for-mac/osxfs-caching/ +- /docker-for-mac/docker-toolbox/ title: Docker Desktop for Mac user manual toc_min: 1 toc_max: 2 diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md index f41aa9e267..0b3c0e24e0 100644 --- a/docker-for-mac/install.md +++ b/docker-for-mac/install.md @@ -13,17 +13,10 @@ By downloading Docker Desktop, you agree to the terms of the [Docker Software En ## What to know before you install -> README FIRST for Docker Toolbox and Docker Machine users -> ->If you are already running Docker on your machine, first read -[Docker Desktop for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the -impact of this installation on your existing setup, how to set your environment -for Docker Desktop on Mac, and how the two products can coexist. - **Relationship to Docker Machine**: Installing Docker Desktop on Mac does not affect machines you created with Docker Machine. You have the option to copy containers and images from your local `default` machine (if one exists) to the Docker Desktop [HyperKit](https://github.com/docker/HyperKit/) VM. When you are running Docker Desktop, you do not need Docker Machine nodes running locally (or anywhere else). With Docker Desktop, you have a new, native virtualization system running (HyperKit) which takes the place of the -VirtualBox system. To learn more, see [Docker Desktop for Mac vs. Docker Toolbox](docker-toolbox.md). +VirtualBox system. ## System requirements diff --git a/docker-for-mac/troubleshoot.md b/docker-for-mac/troubleshoot.md index a17f665a79..5312672f04 100644 --- a/docker-for-mac/troubleshoot.md +++ b/docker-for-mac/troubleshoot.md @@ -222,13 +222,7 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install * 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 - `DOCKER_HOST` environment variable and related variables. - - * If you use bash, use the following command: `unset ${!DOCKER_*}` - - * For other shells, unset each environment variable individually as described - in [Setting up to run Docker Desktop on Mac](docker-toolbox.md#setting-up-to-run-docker-desktop-on-mac) - in [Docker Desktop on Mac vs. Docker Toolbox](docker-toolbox.md). + `DOCKER_HOST` environment variable and related variables. If you use bash, use the following command: `unset ${!DOCKER_*}` * Network connections fail if the macOS Firewall is set to "Block all incoming connections". You can enable the firewall, but `bootpd` must be allowed @@ -236,9 +230,9 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install * For the `hello-world-nginx` example, Docker Desktop must be running to get to the web server on `http://localhost/`. Make sure that the Docker icon is - displayed on the menu bar, and that you run the Docker commands in a shell that is connected to the Docker Desktop Engine (not Engine from Toolbox). + displayed on the menu bar, and that you run the Docker commands in a shell that is connected to the Docker Desktop Engine. Otherwise, you might start the webserver container but get a "web page not - available" error when you go to `localhost`. For more information on distinguishing between the two environments, see [Docker Desktop on Mac vs. Docker Toolbox](docker-toolbox.md). + available" error when you go to `localhost`. * If you see errors like `Bind for 0.0.0.0:8080 failed: port is already allocated` or `listen tcp:0.0.0.0:8080: bind: address is already in use`: diff --git a/docker-for-windows/docker-toolbox.md b/docker-for-windows/docker-toolbox.md index 91eee87103..078f0205e5 100644 --- a/docker-for-windows/docker-toolbox.md +++ b/docker-for-windows/docker-toolbox.md @@ -1,17 +1,60 @@ --- description: Docker Desktop for Windows and Docker Toolbox keywords: windows, alpha, beta, toolbox, docker-machine, tutorial -title: Migrate Docker Toolbox +title: Docker Toolbox +redirect_from: +- /toolbox/ +- /toolbox/overview/ +- /toolbox/toolbox_install_mac/ +- /toolbox/toolbox_install_windows/ +- /toolbox/faqs/ +- /toolbox/faqs/troubleshoot/ +- /docker-for-mac/docker-toolbox/ +toc_min: 1 +toc_max: 2 --- -This page explains how to migrate your Docker Toolbox disk image, or images if -you have them, to Docker Desktop for Windows. +>**Deprecated** +> +> Docker Toolbox has been deprecated and is no longer in active development. Please use Docker Desktop instead. See [Docker Desktop for Mac](../docker-for-mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md). +{: .warning } -## How to migrate Docker Toolbox disk images to Docker Desktop +This page explains how to migrate your Docker Toolbox disk images to Docker Desktop. It also contains instructions on how to uninstall Docker Toolbox from Mac and Windows machines. -Docker Desktop does not propose Toolbox image migration as part of its -installer since version 18.01.0. You can migrate existing Docker -Toolbox images with the steps described below. +## Migrate from Docker Toolbox to Docker Desktop on Mac + +You can migrate existing Docker Toolbox images with the steps described below. + +In a terminal, while running Toolbox, use `docker commit` to create an image snapshot +from a container, for each container you wish to preserve: + +``` +$ docker commit nginx +sha256:1bc0ee792d144f0f9a1b926b862dc88b0206364b0931be700a313111025df022 +``` + +Next, export each of these images (and any other images you wish to keep): + +``` +$ docker save -o nginx.tar sha256:1bc0ee792d144f0f9a1b926b862dc88b0206364b0931be700a313111025df022 +``` + +Next, when running Docker Desktop on Mac, reload all these images: + +``` +$ docker load -i nginx.tar +Loaded image ID: sha256:1bc0ee792d144f0f9a1b926b862dc88b0206364b0931be700a313111025df022 +``` + +Note these steps will not migrate any `docker volume` contents: these must +be copied across manually. + +Finally (optional), if you are done with Docker Toolbox, you can fully +[uninstall](#uninstall-docker-toolbox-on-windows) Docker Toolbox using the instructions described in the following section. + +## Migrate from Docker Toolbox to Docker Desktop on Windows + +You can migrate existing Docker Toolbox images with the steps described below. In a terminal, while running Toolbox, use `docker commit` to create an image snapshot from a container, for each container you wish to preserve: @@ -37,8 +80,108 @@ Loaded image ID: sha256:1bc0ee792d144f0f9a1b926b862dc88b0206364b0931be700a313111 Note these steps will not migrate any `docker volume` contents: these must be copied across manually. -## How to uninstall Docker Toolbox +## Uninstall Docker Toolbox -Whether or not you migrate your Docker Toolbox images, you may decide to -uninstall it. For details on how to perform a clean uninstall of Toolbox, -see [How to uninstall Toolbox](../toolbox/toolbox_install_windows.md#how-to-uninstall-toolbox){: target="_blank" rel="noopener" class="_"}. +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 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. + +### Uninstall Docker Toolbox on Mac + +To uninstall Docker Toolbox on Mac: + +1. List your machines. + + ``` + $ docker-machine ls + NAME ACTIVE DRIVER STATE URL SWARM + dev * virtualbox Running tcp://192.168.99.100:2376 + my-docker-machine virtualbox Stopped + default virtualbox Stopped + ``` + +2. Optionally, remove each machine. For example: + + ``` + $ 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 Mac](../docker-for-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". + +4. Run the following in a command shell to fully remove Kitematic: + + ``` + $ rm -fr ~/Library/Application\ Support/Kitematic + ``` + +5. Remove the `docker`, `docker-compose`, and `docker-machine` commands from + the `/usr/local/bin` folder. Docker Desktop for Mac and Brew may also have + installed them; in case of doubt leave them, or reinstall them via Brew, or + rerun Docker Desktop for Mac (no need to reinstall it). + + ``` + $ rm -f /usr/local/bin/docker + $ rm -f /usr/local/bin/docker-compose + $ rm -f /usr/local/bin/docker-machine + ``` + +6. Optionally, remove the `~/.docker/machine` directory. + + This directory stores some configuration and/or state, such as information + about created machines and certificates. + +7. Uninstall Oracle VirtualBox, which is installed as a part of the + Toolbox install. + +### Uninstall Docker Toolbox on Windows + +To uninstall Toolbox on Windows: + +1. List your machines. + + ``` + $ docker-machine ls + NAME ACTIVE DRIVER STATE URL SWARM + dev * virtualbox Running tcp://192.168.99.100:2376 + my-docker-machine virtualbox Stopped + default virtualbox Stopped + ``` + +2. Optionally, remove each machine. For example: + + ``` + $ 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](../docker-for-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. + +4. Optionally, remove the `C:\Users\\.docker` directory. + + If you want to remove Docker entirely, you + can verify that the uninstall removed + the `.docker` directory under your user path. + If it is still there, remove it manually. + This directory stores some Docker + program configuration and state, such as + information about created machines and + certificates. You usually don't need to remove this directory. + +5. Uninstall Oracle VirtualBox, which is + installed as a part of the Toolbox install. diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md index 0852ef8f0c..32860a128c 100644 --- a/docker-for-windows/index.md +++ b/docker-for-windows/index.md @@ -10,6 +10,7 @@ redirect_from: - /windows/started/ - /winkit/ - /winkit/getting-started/ + title: Docker Desktop for Windows user manual toc_min: 1 toc_max: 2 diff --git a/docker-for-windows/troubleshoot.md b/docker-for-windows/troubleshoot.md index 02958ff5fa..49e3adccb2 100644 --- a/docker-for-windows/troubleshoot.md +++ b/docker-for-windows/troubleshoot.md @@ -434,7 +434,7 @@ consult the shell's documentation. For the `hello-world-nginx` example and others, Docker Desktop must be running to get to the webserver on `http://localhost/`. Make sure that the Docker whale is showing in the menu bar, and that you run the Docker commands in -a shell that is connected to the Docker Desktop Engine (not Engine from Toolbox). Otherwise, you might start the webserver container but get a "web page +a shell that is connected to the Docker Desktop Engine. Otherwise, you might start the webserver container but get a "web page not available" error when you go to `docker`. ### How to solve `port already allocated` errors diff --git a/kitematic/index.md b/kitematic/index.md index 0f176db386..2b83a6df1e 100644 --- a/kitematic/index.md +++ b/kitematic/index.md @@ -5,6 +5,6 @@ keywords: docker, documentation, about, technology, kitematic, gui title: Kitematic --- -Kitematic, the Docker GUI, runs on Mac and Windows operating systems. Beginning with the 1.8 Docker release, you use the [Docker Toolbox](/toolbox/overview/) to install Kitematic. +Kitematic, the Docker GUI, runs on Mac and Windows operating systems. For information about using Kitematic, take a look at the [User Guide](userguide.md). diff --git a/kitematic/userguide.md b/kitematic/userguide.md index 28ed76f867..8d19a53086 100644 --- a/kitematic/userguide.md +++ b/kitematic/userguide.md @@ -28,8 +28,6 @@ First, if you haven't yet done so, download and install Kitematic in one of the * Choose **Kitematic** from the Docker Desktop for Mac or Docker Desktop for Windows menu to get started with the Kitematic install. -* Install [Docker Toolbox](../toolbox/overview.md#ready-to-get-started) (on older systems that do not meet the requirements of [Docker Desktop for Mac](../docker-for-mac/install.md#what-to-know-before-you-install) or [Docker Desktop for Windows](../docker-for-windows/install.md#what-to-know-before-you-install)). - * Download Kitematic directly from the [Kitematic releases page](https://github.com/docker/kitematic/releases/). Start Kitematic. (On desktop systems, click on the app.) diff --git a/machine/get-started.md b/machine/get-started.md index e3e5136c2b..10da668594 100644 --- a/machine/get-started.md +++ b/machine/get-started.md @@ -11,12 +11,9 @@ Docker host inside of a local virtual machine. ## Prerequisite information With the advent of [Docker Desktop for Mac](../docker-for-mac/index.md) and -[Docker Desktop for Windows](../docker-for-windows/index.md) as replacements for -[Docker Toolbox](../toolbox/overview.md), we recommend that you use these for your +[Docker Desktop for Windows](../docker-for-windows/index.md), we recommend that you use these for your primary Docker workflows. You can use these applications to run Docker natively -on your local system without using Docker Machine at all. (See -[Docker Desktop for Mac vs. Docker Toolbox](../docker-for-mac/docker-toolbox.md) -for an explanation on the Mac side.) +on your local system without using Docker Machine at all. For now, however, if you want to create _multiple_ local machines, you still need Docker Machine to create and manage machines for multi-node @@ -58,40 +55,10 @@ lightweight macOS virtualization solution built on top of the Currently, there is no `docker-machine create` driver for HyperKit, so use the `virtualbox` driver to create local machines. (See the [Docker Machine driver for Oracle VirtualBox](drivers/virtualbox.md).) You can -run both HyperKit and Oracle VirtualBox on the same system. To learn more, see -[Docker Desktop for Mac vs. Docker Toolbox](../docker-for-mac/docker-toolbox.md). +run both HyperKit and Oracle VirtualBox on the same system. * Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" rel="noopener" class="_"} - correctly installed on your system (either as part of an earlier Toolbox install, - or manual install). - -#### If you are using Docker Toolbox - -Docker Desktop for Mac and Docker Desktop for Windows both require newer versions of their -respective operating systems, so users with older OS versions must use Docker -Toolbox. - -* If you are using Docker Toolbox on either Mac or an older version Windows - system (without Hyper-V), use the `virtualbox` driver to create a local machine - based on Oracle [VirtualBox](https://www.virtualbox.org/){:target="_blank" rel="noopener" class="_"}. - (See the [Docker Machine driver for Oracle VirtualBox](drivers/virtualbox.md).) - -* 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 - `hyperv` driver to create local machines. (See th - [Docker Machine driver for Microsoft Hyper-V](drivers/hyper-v.md).) - -* Make sure you have [the latest VirtualBox](https://www.virtualbox.org/wiki/Downloads){: target="_blank" rel="noopener" class="_"} - correctly installed on your system. If you used - [Toolbox](https://www.docker.com/products/docker-toolbox){: target="_blank" rel="noopener" class="_"} - or [Docker Desktop for Windows](../docker-for-windows/index.md){: target="_blank" rel="noopener" class="_"} - to install Docker Machine, VirtualBox is - automatically installed. - -* If you used the Quickstart Terminal to launch your first machine and set your - terminal environment to point to it, a default machine was automatically - created. If so, you can still follow along with these steps, but - create another machine and name it something other than `default`. + correctly installed on your system. ## Use Machine to run Docker containers @@ -125,9 +92,7 @@ The examples here show how to create and start a machine, run Docker commands, a it `default` as shown in the example. If you already have a "default" machine, choose another name for this new machine. - * 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.) - - * 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](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.) + 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](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.) $ docker-machine create --driver virtualbox default Running pre-create checks... @@ -292,10 +257,7 @@ For machines other than `default`, and commands other than those listed above, y ## Unset environment variables in the current shell You might want to use the current shell to connect to a different Docker Engine. -This would be the case if, for example, you are -[running Docker Desktop for Mac concurrent with Docker Toolbox](../docker-for-mac/docker-toolbox.md) -and want to talk to two different Docker Engines. -In both scenarios, you have the option to switch the environment for the current +In such scenarios, you have the option to switch the environment for the current shell to talk to different Docker engines. 1. Run `env|grep DOCKER` to check whether DOCKER environment variables are set. @@ -344,10 +306,6 @@ shell to talk to different Docker engines. If you are running Docker Desktop for Mac, you can run Docker commands to talk to the Docker Engine installed with that app. - Since [Docker Desktop for Windows is incompatible with Toolbox](../docker-for-windows/install.md#what-to-know-before-you-install), - this scenario isn't applicable because Docker Desktop for Windows uses the Docker - Engine and Docker Machine that come with it. - ## Start local machines on startup To ensure that the Docker client is automatically configured at the start of diff --git a/machine/overview.md b/machine/overview.md index 738f4e8f79..661315ec79 100644 --- a/machine/overview.md +++ b/machine/overview.md @@ -52,7 +52,7 @@ Docker Machine has these two broad use cases. ![Docker Machine on Mac and Windows](img/machine-mac-win.png){: .white-bg} - If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../docker-for-mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally. Installing Docker Machine on a Mac or Windows box with the [Docker Toolbox](../toolbox/overview.md) installer provisions a local virtual machine with Docker Engine, gives you the ability to connect it, and run `docker` commands. + If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../docker-for-mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally. * **I want to provision Docker hosts on remote systems** diff --git a/registry/recipes/osx-setup-guide.md b/registry/recipes/osx-setup-guide.md index 90891fd426..16afaac24d 100644 --- a/registry/recipes/osx-setup-guide.md +++ b/registry/recipes/osx-setup-guide.md @@ -14,8 +14,6 @@ This is useful if you intend to run a registry server natively on macOS. You can start a VM on macOS, and deploy your registry normally as a container using Docker inside that VM. -The simplest road to get there is traditionally to use the [docker Toolbox](https://www.docker.com/toolbox), or [docker-machine](../../machine/index.md), which usually relies on the [boot2docker](http://boot2docker.io/) ISO inside a VirtualBox VM. - ### Solution Using the method described here, you install and compile your own from the git repository and run it as an macOS agent.