Skip to content

Commit af3a5a9

Browse files
author
paigehargrave
authored
Update docker-toolbox.md
1 parent 9410403 commit af3a5a9

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

docker-for-mac/docker-toolbox.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
description: Docker for Mac and Docker Toolbox
2+
description: Docker Desktop for Mac and Docker Toolbox
33
keywords: mac, windows, alpha, beta, toolbox, docker-machine, tutorial
44
redirect_from:
55
- /mackit/docker-toolbox/
6-
title: Docker for Mac vs. Docker Toolbox
6+
title: Docker Desktop for Mac vs. Docker Toolbox
77
---
88

99
If you already have an installation of Docker Toolbox, read these topics
10-
first to learn how Docker for Mac and Docker Toolbox differ, and how they can
10+
first to learn how Docker Desktop for Mac and Docker Toolbox differ, and how they can
1111
coexist.
1212

1313
## The Docker Toolbox environment
@@ -29,24 +29,24 @@ This setup is shown in the following diagram.
2929
![Docker Toolbox Install](images/toolbox-install.png)
3030

3131

32-
## The Docker for Mac environment
32+
## The Docker Desktop for Mac environment
3333

34-
Docker for Mac is a Mac native application, that you install in `/Applications`.
34+
Docker Desktop for Mac is a Mac native application, that you install in `/Applications`.
3535
At installation time, it creates symlinks in `/usr/local/bin` for `docker` and
3636
`docker-compose` and others, to the commands in the application
3737
bundle, in `/Applications/Docker.app/Contents/Resources/bin`.
3838

39-
Here are some key points to know about Docker for Mac before you get started:
39+
Here are some key points to know about Docker Desktop for Mac before you get started:
4040

41-
* Docker for Mac uses
41+
* Docker Desktop for Mac uses
4242
[HyperKit](https://github.com/docker/HyperKit/) instead of Virtual Box.
4343
Hyperkit is a lightweight macOS virtualization solution built on top of
4444
Hypervisor.framework in macOS 10.10 Yosemite and higher.
4545

46-
* When you install Docker for Mac, machines created with Docker Machine are
46+
* When you install Docker Desktop for Mac, machines created with Docker Machine are
4747
not affected.
4848

49-
* Docker for Mac does not use `docker-machine` to provision its VM.
49+
* Docker Desktop for Mac does not use `docker-machine` to provision its VM.
5050
The Docker Engine API is exposed on a
5151
socket available to the Mac host at `/var/run/docker.sock`. This is the
5252
default location Docker and Docker Compose clients use to connect to
@@ -56,22 +56,22 @@ Here are some key points to know about Docker for Mac before you get started:
5656

5757
This setup is shown in the following diagram.
5858

59-
![Docker for Mac Install](images/docker-for-mac-install.png)
59+
![Docker Desktop for Mac Install](images/docker-for-mac-install.png)
6060

61-
With Docker for Mac, you only get (and only usually need) one VM, managed by Docker
62-
for Mac. Docker for Mac automatically upgrades the Docker client and
61+
With Docker Desktop for Mac, you only get (and only usually need) one VM, managed by Docker
62+
for Mac. Docker Desktop for Mac automatically upgrades the Docker client and
6363
daemon when updates are available.
6464

65-
Also note that Docker for Mac can’t route traffic to containers, so you can't
65+
Also note that Docker Desktop for Mac can’t route traffic to containers, so you can't
6666
directly access an exposed port on a running container from the hosting machine.
6767

6868
If you do need multiple VMs, such as when testing multi-node swarms, you can
69-
continue to use Docker Machine, which operates outside the scope of Docker for
70-
Mac. See [Docker Toolbox and Docker for Mac
69+
continue to use Docker Machine, which operates outside the scope of Docker Desktop for
70+
Mac. See [Docker Toolbox and Docker Desktop for Mac
7171
coexistence](docker-toolbox.md#docker-toolbox-and-docker-for-mac-coexistence).
7272

7373

74-
## Setting up to run Docker for Mac
74+
## Setting up to run Docker Desktop for Mac
7575

7676
1. Check whether Toolbox DOCKER environment variables are set:
7777

@@ -81,11 +81,11 @@ coexistence](docker-toolbox.md#docker-toolbox-and-docker-for-mac-coexistence).
8181
DOCKER_TLS_VERIFY=1
8282
DOCKER_CERT_PATH=/Users/<your_username>/.docker/machine/machines/default
8383

84-
If this command returns no output, you are ready to use Docker for Mac.
84+
If this command returns no output, you are ready to use Docker Desktop for Mac.
8585

8686
If it returns output (as shown in the example), unset
8787
the `DOCKER` environment variables to make the client talk to the
88-
Docker for Mac Engine (next step).
88+
Docker Desktop for Mac Engine (next step).
8989

9090
2. Run the `unset` command on the following `DOCKER` environment variables to
9191
unset them in the current shell.
@@ -105,22 +105,22 @@ coexistence](docker-toolbox.md#docker-toolbox-and-docker-for-mac-coexistence).
105105

106106
> **Note**: If you have a shell script as part of your profile that sets these
107107
> `DOCKER` environment variables automatically each time you open a command
108-
> window, then you need to unset these each time you want to use Docker for Mac.
108+
> window, then you need to unset these each time you want to use Docker Desktop for Mac.
109109
110-
> If you install Docker for Mac on a machine where Docker Toolbox is installed..
110+
> If you install Docker Desktop for Mac on a machine where Docker Toolbox is installed..
111111
>
112-
> Docker for Mac replaces the `docker` and `docker-compose` command lines in
112+
> Docker Desktop for Mac replaces the `docker` and `docker-compose` command lines in
113113
> `/usr/local/bin` with symlinks to its own versions.
114114
{:.warning}
115115

116116
See also [Unset environment variables in the current
117117
shell](/machine/get-started.md#unset-environment-variables-in-the-current-shell)
118118
in the Docker Machine topics.
119119

120-
## Docker Toolbox and Docker for Mac coexistence
120+
## Docker Toolbox and Docker Desktop for Mac coexistence
121121

122-
You can use Docker for Mac and Docker Toolbox together on the same machine. When
123-
you want to use Docker for Mac, make sure all DOCKER environment variables are
122+
You can use Docker Desktop for Mac and Docker Toolbox together on the same machine. When
123+
you want to use Docker Desktop for Mac, make sure all DOCKER environment variables are
124124
unset. You can do this in bash with `unset ${!DOCKER_*}`. When you want to use
125125
one of the VirtualBox VMs you have set with `docker-machine`, just run a `eval
126126
$(docker-machine env default)` (or the name of the machine you want to target).
@@ -129,13 +129,13 @@ machine.
129129

130130
This setup is represented in the following diagram.
131131

132-
![Docker Toolbox and Docker for Mac coexistence](images/docker-for-mac-and-toolbox.png)
132+
![Docker Toolbox and Docker Desktop for Mac coexistence](images/docker-for-mac-and-toolbox.png)
133133

134134

135135
## Using different versions of Docker tools
136136

137137
The coexistence setup works as is as long as your VirtualBox VMs provisioned
138-
with `docker-machine` run the same version of Docker Engine as Docker for Mac.
138+
with `docker-machine` run the same version of Docker Engine as Docker Desktop for Mac.
139139
If you need to use VMs running older versions of Docker Engine, you can use a
140140
tool like [Docker Version Manager](https://github.com/getcarina/dvm) to manage
141141
several versions of docker client.
@@ -149,9 +149,9 @@ created with Docker Machine can cause problems (client can't talk to the server
149149
or host machines).
150150

151151
If you already have [Docker Toolbox](/toolbox/overview/) installed, and then
152-
install Docker for Mac, you might get a newer version of the Docker client. Run
152+
install Docker Desktop for Mac, you might get a newer version of the Docker client. Run
153153
`docker version` in a command shell to see client and server versions. In this
154-
example, the client installed with Docker for Mac is `Version: 1.11.1` and the
154+
example, the client installed with Docker Desktop for Mac is `Version: 1.11.1` and the
155155
server (which was installed earlier with Toolbox) is Version: 1.11.0.
156156

157157
$ docker version
@@ -164,7 +164,7 @@ server (which was installed earlier with Toolbox) is Version: 1.11.0.
164164
...
165165

166166
Also, if you created machines with Docker Machine (installed with Toolbox) then
167-
upgraded or installed Docker for Mac, you might have machines running different
167+
upgraded or installed Docker Desktop for Mac, you might have machines running different
168168
versions of Engine. Run `docker-machine ls` to view version information for the
169169
machines you created. In this example, the DOCKER column shows that each machine
170170
is running a different version of server.
@@ -181,9 +181,9 @@ There are a few ways to address this problem and keep using your older
181181
machines. One solution is to use a version manager like
182182
[DVM](https://github.com/getcarina/dvm).
183183

184-
## Migrating from Docker Toolbox to Docker for Mac
184+
## Migrating from Docker Toolbox to Docker Desktop for Mac
185185

186-
Docker for Mac does not propose Toolbox image migration as part of its
186+
Docker Desktop for Mac does not propose Toolbox image migration as part of its
187187
installer since version 18.01.0. You can migrate existing Docker
188188
Toolbox images with the scripts described below. (This migration
189189
cannot merge images from both Docker and Toolbox: any existing Docker image is
@@ -235,7 +235,7 @@ it](https://docs.docker.com/toolbox/toolbox_install_mac/#how-to-uninstall-toolbo
235235

236236
## How do I uninstall Docker Toolbox?
237237

238-
You might decide that you do not need Toolbox now that you have Docker for Mac,
238+
You might decide that you do not need Toolbox now that you have Docker Desktop for Mac,
239239
and want to uninstall it. For details on how to perform a clean uninstall of
240240
Toolbox on the Mac, see [How to uninstall
241241
Toolbox](/toolbox/toolbox_install_mac.md#how-to-uninstall-toolbox) in the

0 commit comments

Comments
 (0)