Skip to content

Commit 1c3950f

Browse files
committed
edits
1 parent f86de3c commit 1c3950f

File tree

5 files changed

+18
-40
lines changed

5 files changed

+18
-40
lines changed

content/manuals/desktop/troubleshoot-and-support/faqs/general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For details, see [Docker Engine API](/reference/api/engine/_index.md).
5858
### How do I connect from a container to a service on the host?
5959

6060
The host has a changing IP address, or none if you have no network access.
61-
We recommend that you connect to the special DNS name `host.docker.internal`,
61+
It is recommend that you connect to the special DNS name `host.docker.internal`,
6262
which resolves to the internal IP address used by the host.
6363

6464
For more information and examples, see [how to connect from a container to a service on the host](/manuals/desktop/features/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host).

content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ and `/etc/subgid` (see `subgid(5)`) must be present. Docker Desktop only
5555
supports subordinate ID delegation configured via files. Docker Desktop maps the
5656
current user ID and GID to 0 in the containers. It uses the first entry
5757
corresponding to the current user in `/etc/subuid` and `/etc/subgid` to set up
58-
mappings for IDs above 0 in the containers.
58+
mappings for IDs greater than 0 in the containers.
5959

6060
| ID in container | ID on host |
6161
| --------------- | -------------------------------------------------------------------------------- |
62-
| 0 (root) | ID of the user running DD (e.g. 1000) |
62+
| 0 (root) | ID of the user running Docker Desktop (e.g. 1000) |
6363
| 1 | 0 + beginning of ID range specified in `/etc/subuid`/`/etc/subgid` (e.g. 100000) |
6464
| 2 | 1 + beginning of ID range specified in `/etc/subuid`/`/etc/subgid` (e.g. 100001) |
6565
| 3 | 2 + beginning of ID range specified in `/etc/subuid`/`/etc/subgid` (e.g. 100002) |

content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ weight: 20
1515

1616
HyperKit is a hypervisor built on top of the Hypervisor.framework in macOS. It runs entirely in userspace and has no other dependencies.
1717

18-
We use HyperKit to eliminate the need for other VM products, such as Oracle
19-
VirtualBox or VMWare Fusion.
18+
Docker uses HyperKit to eliminate the need for other VM products, such as Oracle
19+
VirtualBox or VMware Fusion.
2020

2121
### What is the benefit of HyperKit?
2222

23-
HyperKit is thinner than VirtualBox and VMWare fusion, and the version included is customized for Docker workloads on Mac.
23+
HyperKit is thinner than VirtualBox and VMware fusion, and the version included is customized for Docker workloads on Mac.
2424

2525
### Where does Docker Desktop store Linux containers and images?
2626

content/manuals/desktop/troubleshoot-and-support/troubleshoot/known-issues.md

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ aliases:
1010

1111
{{< tabs >}}
1212
{{< tab name="For Mac with Intel chip" >}}
13-
* The Mac Activity Monitor reports that Docker is using twice the amount of memory it's actually using. This is due to a bug in MacOS. We have written [a detailed report](https://docs.google.com/document/d/17ZiQC1Tp9iH320K-uqVLyiJmk4DHJ3c4zgQetJiKYQM/edit?usp=sharing) on this.
13+
- The Mac Activity Monitor reports that Docker is using twice the amount of memory it's actually using. This is due to a [bug in macOS].(https://docs.google.com/document/d/17ZiQC1Tp9iH320K-uqVLyiJmk4DHJ3c4zgQetJiKYQM/edit?usp=sharing) on this.
1414

15-
* Force-ejecting the `.dmg` after running `Docker.app` from it can cause the
16-
whale icon to become unresponsive, Docker tasks to show as not responding in
17-
the Activity Monitor, and for some processes to consume a large amount of CPU
18-
resources. Reboot and restart Docker to resolve these issues.
15+
- Force-ejecting the `.dmg` after running `Docker.app` from it can cause the
16+
whale icon to become unresponsive, Docker tasks to show as not responding in the Activity Monitor, and for some processes to consume a large amount of CPU resources. Reboot and restart Docker to resolve these issues.
1917

20-
* Docker Desktop uses the `HyperKit` hypervisor
18+
- Docker Desktop uses the `HyperKit` hypervisor
2119
(https://github.com/docker/hyperkit) in macOS 10.10 Yosemite and higher. If
2220
you are developing with tools that have conflicts with `HyperKit`, such as
2321
[Intel Hardware Accelerated Execution Manager
@@ -27,7 +25,7 @@ aliases:
2725
This allows you to continue work with the other tools and prevent `HyperKit`
2826
from interfering.
2927

30-
* If you are working with applications like [Apache
28+
- If you are working with applications like [Apache
3129
Maven](https://maven.apache.org/) that expect settings for `DOCKER_HOST` and
3230
`DOCKER_CERT_PATH` environment variables, specify these to connect to Docker
3331
instances through Unix sockets. For example:
@@ -36,38 +34,18 @@ aliases:
3634
$ export DOCKER_HOST=unix:///var/run/docker.sock
3735
```
3836

39-
* There are a number of issues with the performance of directories bind-mounted
40-
into containers. In particular, writes of small blocks, and traversals of large
41-
directories are currently slow. Additionally, containers that perform large
42-
numbers of directory operations, such as repeated scans of large directory
43-
trees, may suffer from poor performance. Applications that behave in this way
44-
include:
45-
46-
- `rake`
47-
- `ember build`
48-
- Symfony
49-
- Magento
50-
- Zend Framework
51-
- PHP applications that use [Composer](https://getcomposer.org) to install
52-
dependencies in a `vendor` folder
53-
54-
As a workaround for this behavior, you can put vendor or third-party library
55-
directories in Docker volumes, perform temporary file system operations
56-
outside of bind mounts, and use third-party tools like Unison or `rsync` to
57-
synchronize between container directories and bind-mounted directories. We are
58-
actively working on performance improvements using a number of different
59-
techniques. To learn more, see the [topic on our roadmap](https://github.com/docker/roadmap/issues/7).
6037
{{< /tab >}}
6138
{{< tab name="For Mac with Apple silicon" >}}
62-
- On Apple silicon in native `arm64` containers, older versions of `libssl` such as `debian:buster`, `ubuntu:20.04`, and `centos:8` will segfault when connected to some TLS servers, for example, `curl https://dl.yarnpkg.com`. The bug is fixed in newer versions of `libssl` in `debian:bullseye`, `ubuntu:21.04`, and `fedora:35`.
39+
6340
- Some command line tools do not work when Rosetta 2 is not installed.
6441
- The old version 1.x of `docker-compose`. Use Compose V2 instead - type `docker compose`.
6542
- The `docker-credential-ecr-login` credential helper.
6643
- Some images do not support the ARM64 architecture. You can add `--platform linux/amd64` to run (or build) an Intel image using emulation.
6744

68-
However, attempts to run Intel-based containers on Apple silicon machines under emulation can crash as qemu sometimes fails to run the container. In addition, filesystem change notification APIs (`inotify`) do not work under qemu emulation. Even when the containers do run correctly under emulation, they will be slower and use more memory than the native equivalent.
45+
However, attempts to run Intel-based containers on Apple silicon machines under emulation can crash as QEMU sometimes fails to run the container. In addition, filesystem change notification APIs (`inotify`) do not work under QEMU emulation. Even when the containers do run correctly under emulation, they will be slower and use more memory than the native equivalent.
6946

70-
In summary, running Intel-based containers on Arm-based machines should be regarded as "best effort" only. We recommend running arm64 containers on Apple silicon machines whenever possible, and encouraging container authors to produce arm64, or multi-arch, versions of their containers. This issue should become less common over time, as more and more images are rebuilt [supporting multiple architectures](https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/).
47+
In summary, running Intel-based containers on Arm-based machines should be regarded as "best effort" only. We recommend running `arm64` containers on Apple silicon machines whenever possible, and encouraging container authors to produce `arm64`, or multi-arch, versions of their containers. This issue should become less common over time, as more and more images are rebuilt [supporting multiple architectures](https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/).
7148
- Users may occasionally experience data drop when a TCP stream is half-closed.
49+
7250
{{< /tab >}}
7351
{{< /tabs >}}

content/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](/manual
205205

206206
#### Cause
207207

208-
In Docker Desktop version 4.19, gVisor replaced VPNKit to enhance the performance of VM networking when using the Virtualization framework on macOS 13 and above.
208+
In Docker Desktop version 4.19, gVisor replaced VPNKit to enhance the performance of VM networking when using the Virtualization framework on macOS 13 and later.
209209

210210
#### Solution
211211

@@ -308,7 +308,7 @@ $ docker run --rm -ti -v /c/Users/user/work:/work alpine ls /work
308308

309309
### Issue: Docker commands failing in Git Bash
310310

311-
#### Error message:
311+
#### Error message
312312

313313
```console
314314
$ docker run --rm -ti -v C:\Users\user\work:/work alpine
@@ -399,7 +399,7 @@ To turn on nested virtualization, see [Run Docker Desktop for Windows in a VM or
399399

400400
##### Hypervisor enabled at Windows startup
401401

402-
If you have completed the steps described above and are still experiencing
402+
If you have completed the previous steps and are still experiencing
403403
Docker Desktop startup issues, this could be because the Hypervisor is installed,
404404
but not launched during Windows startup. Some tools (such as older versions of
405405
Virtual Box) and video game installers turn off hypervisor on boot. To turn it back on:

0 commit comments

Comments
 (0)