Skip to content

Commit bccca85

Browse files
author
paigehargrave
authored
Update index.md
1 parent 0035e29 commit bccca85

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

docker-for-mac/index.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ redirect_from:
1111
- /engine/installation/mac/
1212
- /docker-for-mac/index/
1313
- /docker-for-mac/osx/
14-
title: Get started with Docker for Mac
14+
title: Get started with Docker Desktop for Mac
1515
---
1616

17-
Welcome to Docker for Mac! Docker is a full development platform for creating
18-
containerized apps, and Docker for Mac is the best way to get started with
17+
Welcome to Docker Desktop for Mac! Docker is a full development platform for creating
18+
containerized apps, and Docker Desktop for Mac is the best way to get started with
1919
Docker _on a Mac_.
2020

21-
> See [Install Docker for Mac](install.md){: target="_blank" class="_"} for
21+
> See [Install Docker Desktop for Mac](install.md){: target="_blank" class="_"} for
2222
> information on system requirements and stable & edge channels.
2323
2424
## Check versions
@@ -119,7 +119,7 @@ General settings are:
119119
manually by choosing ![whale menu](images/whale-x.png){: .inline} → **Check
120120
for Updates**.
121121
122-
- **Include VM in Time Machine backups** backs up the Docker for Mac virtual
122+
- **Include VM in Time Machine backups** backs up the Docker Desktop for Mac virtual
123123
machine. (Disabled by default.)
124124
125125
- **Securely store Docker logins in MacOS keychain** stores your Docker login
@@ -167,11 +167,11 @@ settings-advanced](images/menu/prefs-advanced.png){:width="400px"}
167167
168168
Advanced settings are:
169169
170-
**CPUs**: By default, Docker for Mac is set to use half the number of processors
170+
**CPUs**: By default, Docker Desktop for Mac is set to use half the number of processors
171171
available on the host machine. To increase processing power, set this to a
172172
higher number; to decrease, lower the number.
173173
174-
**Memory**: By default, Docker for Mac is set to use `2` GB runtime memory,
174+
**Memory**: By default, Docker Desktop for Mac is set to use `2` GB runtime memory,
175175
allocated from the total available memory on your Mac. To increase RAM, set this
176176
to a higher number; to decrease it, lower the number.
177177
@@ -190,7 +190,7 @@ the existing image or replace it.
190190
191191
### Proxies
192192
193-
Docker for Mac detects HTTP/HTTPS Proxy Settings from macOS and automatically
193+
Docker Desktop for Mac detects HTTP/HTTPS Proxy Settings from macOS and automatically
194194
propagates these to Docker and to your containers. For example, if you set your
195195
proxy settings to `http://proxy.example.com`, Docker uses this proxy when
196196
pulling containers.
@@ -234,10 +234,10 @@ Select **Basic** to configure the daemon with interactive settings, or select
234234
235235
#### Experimental features
236236
237-
Both Docker for Mac Stable and Edge releases have experimental features enabled
237+
Both Docker Desktop for Mac Stable and Edge releases have experimental features enabled
238238
on Docker Engine, as described [Docker Experimental Features
239239
README](https://github.com/docker/docker-ce/blob/master/components/cli/experimental/README.md){:
240-
target="_blank" class="_"}. If you uncheck **experimental mode**, Docker for Mac
240+
target="_blank" class="_"}. If you uncheck **experimental mode**, Docker Desktop for Mac
241241
uses the current generally available release of Docker Engine.
242242
243243
> Don't enable experimental features in production
@@ -288,7 +288,7 @@ changes when asked.
288288
289289
### Kubernetes
290290
291-
In Docker for Mac [17.12 Edge
291+
In Docker Desktop for Mac [17.12 Edge
292292
(mac45)](/docker-for-mac/edge-relese-notes/#docker-community-edition-17120-ce-mac45-2018-01-05)
293293
and higher, and [18.06 Stable
294294
(mac70)](/docker-for-mac/release-notes/#docker-community-edition-18060-ce-mac70-2018-07-25)
@@ -323,7 +323,7 @@ experience conflicts, remove `/usr/local/bin/kubectl`.
323323
`/usr/local/bin/kubectl` command is installed on your Mac.
324324
325325
When Kubernetes is enabled and running, an additional status bar item displays
326-
at the bottom right of the Docker for Mac Preferences dialog.
326+
at the bottom right of the Docker Desktop for Mac Preferences dialog.
327327
328328
![Installation
329329
complete](images/kubernetes/kubernetes-install-complete.png){:width="400px"}
@@ -343,7 +343,7 @@ experience conflicts, remove `/usr/local/bin/kubectl`.
343343
Kubernetes containers are stopped and removed, and the
344344
`/usr/local/bin/kubectl` command is removed.
345345
346-
For more about using the Kubernetes integration with Docker for Mac, see
346+
For more about using the Kubernetes integration with Docker Desktop for Mac, see
347347
[Deploy on Kubernetes](kubernetes.md){:target="_blank" class="_"}.
348348
349349
### Reset
@@ -362,12 +362,12 @@ Reset settings are:
362362
reset to factory defaults (which would cause you to lose settings).
363363
364364
* **Reset to factory defaults** - Choose this option to reset all options on
365-
Docker for Mac to its initial state, the same as when it was first installed.
365+
Docker Desktop for Mac to its initial state, the same as when it was first installed.
366366
367-
* **Uninstall** - Choose this option to remove Docker for Mac from your
367+
* **Uninstall** - Choose this option to remove Docker Desktop for Mac from your
368368
system.
369369
370-
> Uninstall Docker for Mac from the commandline
370+
> Uninstall Docker Desktop for Mac from the commandline
371371
>
372372
>To uninstall Docker from Mac from a terminal, run: `<DockerforMacPath>
373373
>--uninstall`. If your instance is installed in the default location, this
@@ -389,13 +389,13 @@ registries) to your Docker daemon.
389389
390390
### Add custom CA certificates (server side)
391391
392-
All trusted CAs (root or intermediate) are supported. Docker for Mac creates a
392+
All trusted CAs (root or intermediate) are supported. Docker Desktop for Mac creates a
393393
certificate bundle of all user-trusted CAs based on the Mac Keychain, and
394394
appends it to Moby trusted certificates. So if an enterprise SSL certificate is
395-
trusted by the user on the host, it is trusted by Docker for Mac.
395+
trusted by the user on the host, it is trusted by Docker Desktop for Mac.
396396
397397
To manually add a custom, self-signed certificate, start by adding the
398-
certificate to the macOS keychain, which is picked up by Docker for Mac. Here is
398+
certificate to the macOS keychain, which is picked up by Docker Desktop for Mac. Here is
399399
an example.
400400
401401
```bash
@@ -412,12 +412,12 @@ $ security add-trusted-cert -d -r trustRoot -k ~/Library/Keychains/login.keychai
412412
See also, [Directory structures for
413413
certificates](#directory-structures-for-certificates).
414414
415-
> **Note:** You need to restart Docker for Mac after making any changes to the
415+
> **Note:** You need to restart Docker Desktop for Mac after making any changes to the
416416
keychain or to the `~/.docker/certs.d` directory in order for the changes to
417417
take effect.
418418
419419
For a complete explanation of how to do this, see the blog post [Adding
420-
Self-signed Registry Certs to Docker & Docker for
420+
Self-signed Registry Certs to Docker & Docker Desktop for
421421
Mac](http://container-solutions.com/adding-self-signed-registry-certs-docker-mac/){:target="_blank"
422422
class="_"}.
423423
@@ -427,16 +427,16 @@ You can put your client certificates in
427427
`~/.docker/certs.d/<MyRegistry>:<Port>/client.cert` and
428428
`~/.docker/certs.d/<MyRegistry>:<Port>/client.key`.
429429
430-
When the Docker for Mac application starts up, it copies the `~/.docker/certs.d`
430+
When the Docker Desktop for Mac application starts up, it copies the `~/.docker/certs.d`
431431
folder on your Mac to the `/etc/docker/certs.d` directory on Moby (the Docker
432432
for Mac `xhyve` virtual machine).
433433
434-
> * You need to restart Docker for Mac after making any changes to the keychain
434+
> * You need to restart Docker Desktop for Mac after making any changes to the keychain
435435
> or to the `~/.docker/certs.d` directory in order for the changes to take
436436
> effect.
437437
>
438438
> * The registry cannot be listed as an _insecure registry_ (see [Docker
439-
> Daemon](index.md#docker-daemon)). Docker for Mac ignores certificates listed
439+
> Daemon](index.md#docker-daemon)). Docker Desktop for Mac ignores certificates listed
440440
> under insecure registries, and does not send client certificates. Commands
441441
> like `docker run` that attempt to pull from the registry produce error
442442
> messages on the command line, as well as on the registry.
@@ -483,7 +483,7 @@ topics.
483483
484484
## Install shell completion
485485
486-
Docker for Mac comes with scripts to enable completion for the `docker`,
486+
Docker Desktop for Mac comes with scripts to enable completion for the `docker`,
487487
`docker-machine`, and `docker-compose` commands. The completion scripts may be
488488
found inside `Docker.app`, in the `Contents/Resources/etc/` directory and can be
489489
installed both in Bash and Zsh.
@@ -521,10 +521,10 @@ ln -s $etc/docker-compose.zsh-completion /usr/local/share/zsh/site-functions/_do
521521
## Give feedback and get help
522522
523523
To get help from the community, review current user topics, join or start a
524-
discussion, log on to our [Docker for Mac
524+
discussion, log on to our [Docker Desktop for Mac
525525
forum](https://forums.docker.com/c/docker-for-mac){:target="_blank" class="_"}.
526526
527-
To report bugs or problems, log on to [Docker for Mac issues on
527+
To report bugs or problems, log on to [Docker Desktop for Mac issues on
528528
GitHub](https://github.com/docker/for-mac/issues){:target="_blank" class="_"},
529529
where you can review community reported issues, and file new ones. See [Logs
530530
and Troubleshooting](troubleshoot.md) for more details.
@@ -535,16 +535,16 @@ options at the bottom of each docs page.
535535
## Docker Hub
536536
537537
You can access your [Docker ID](/docker-id/index.md){:target="_blank"
538-
class="_"} account from within Docker for Mac.
538+
class="_"} account from within Docker Desktop for Mac.
539539
540540
![Docker ID](images/docker-cloud.png){:width="550px"}
541541
542-
From the Docker for Mac menu, sign in to Docker Hub with your Docker ID, or
542+
From the Docker Desktop for Mac menu, sign in to Docker Hub with your Docker ID, or
543543
create one.
544544
545545
![Docker ID sign-in](images/menu/sign-in.png){: .with-border width="250px"}
546546
547-
Then use the Docker for Mac menu to create, view, or navigate directly to your
547+
Then use the Docker Desktop for Mac menu to create, view, or navigate directly to your
548548
Cloud resources, including **organizations**, **repositories**, and **swarms**.
549549
550550
Check out these [Docker Hub topics](/docker-hub/index.md){:target="_blank"

0 commit comments

Comments
 (0)