Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1183,11 +1183,11 @@ manuals:
title: Dashboard
- sectiontitle: Change settings
section:
- path: /desktop/settings/mac-settings/
- path: /desktop/settings/mac/
title: On Mac
- path: /desktop/settings/windows-settings/
- path: /desktop/settings/windows/
title: On Windows
- path: /desktop/settings/linux-settings/
- path: /desktop/settings/linux/
title: On Linux
- path: /desktop/networking/
title: Explore networking features
Expand Down
2 changes: 1 addition & 1 deletion compose/gettingstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ mount is denied, or a service cannot start, try enabling file or drive sharing.
Volume mounting requires shared drives for projects that live outside of
`C:\Users` (Windows) or `/Users` (Mac), and is required for _any_ project on
Docker Desktop for Windows that uses [Linux containers](../desktop/windows/index.md#switch-between-windows-and-linux-containers).
For more information, see [File sharing](../desktop/settings/mac-settings.md#file-sharing) on Docker
For more information, see [File sharing](../desktop/settings/mac.md#file-sharing) on Docker
for Mac, and the general examples on how to
> [Manage data in containers](../storage/volumes.md).
>
Expand Down
2 changes: 1 addition & 1 deletion desktop/faqs/windowsfaqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Desktop. For more information, see [Docker Desktop fails to start when anti-viru
### Can I change permissions on shared volumes for container-specific deployment requirements?

Docker Desktop does not enable you to control (`chmod`)
the Unix-style permissions on [shared volumes](../settings/windows-settings.md#file-sharing) for
the Unix-style permissions on [shared volumes](../settings/windows.md#file-sharing) for
deployed containers, but rather sets permissions to a default value of
[0777](http://permissions-calculator.org/decode/0777/){: target="_blank" rel="noopener" class="_"}
(`read`, `write`, `execute` permissions for `user` and for
Expand Down
2 changes: 1 addition & 1 deletion desktop/install/linux-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ Log out and log back in so that your group membership is re-evaluated.
Docker Desktop for Linux and Docker Engine can be installed side-by-side on the
same machine. Docker Desktop for Linux stores containers and images in an isolated
storage location [within a VM](linux-install.md#why-docker-desktop-for-linux-runs-a-vm) and offers
controls to restrict [its resources](../settings/linux-settings.md#resources). Using a dedicated storage
controls to restrict [its resources](../settings/linux.md#resources). Using a dedicated storage
location for Docker Desktop prevents it from interfering with a Docker Engine
installation on the same machine.

Expand Down
4 changes: 2 additions & 2 deletions desktop/linux/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ The Troubleshoot page contains the following options:

* **Support**: Users with a paid Docker subscription can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](../../support/index.md).

* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](../settings/linux-settings.md#kubernetes).
* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](../settings/linux.md#kubernetes).

* **Clean / Purge data**: This option resets all Docker data _without_ a
reset to factory defaults. Selecting this option results in the loss of existing settings.
Expand Down Expand Up @@ -146,7 +146,7 @@ to learn how to view the Docker Daemon logs.
If you are using mounted volumes and get runtime errors indicating an
application file is not found, access to a volume mount is denied, or a service
cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md),
you might need to enable [file sharing](../settings/linux-settings.md#file-sharing).
you might need to enable [file sharing](../settings/linux.md#file-sharing).

Volume mounting requires shared drives for projects that live outside of the
`/home/<user>` directory. Go to ![whale menu](images/whale-x.png){: .inline} >
Expand Down
2 changes: 1 addition & 1 deletion desktop/mac/apple-silicon.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $ softwareupdate --install-rosetta
### Known issues

- Some command line tools do not work when Rosetta 2 is not installed.
- The old version 1.x of `docker-compose`. We recommend that you use Compose V2 instead. Either type `docker compose` or enable the **Use Docker Compose V2** option in the [General preferences tab](../settings/mac-settings.md#general).
- The old version 1.x of `docker-compose`. We recommend that you use Compose V2 instead. Either type `docker compose` or enable the **Use Docker Compose V2** option in the [General preferences tab](../settings/mac.md#general).
- The `docker scan` command and the underlying `snyk` binary.
- The `docker-credential-ecr-login` credential helper.
- Not all images are available for ARM64 architecture. You can add `--platform linux/amd64` to run an Intel image under emulation. In particular, the [mysql](https://hub.docker.com/_/mysql?tab=tags&page=1&ordering=last_updated) image is not available for ARM64. You can work around this issue by using a [mariadb](https://hub.docker.com/_/mariadb?tab=tags&page=1&ordering=last_updated) image.
Expand Down
4 changes: 2 additions & 2 deletions desktop/mac/troubleshoot.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The Troubleshoot page contains the following options:

* **Support**: Users with a paid Docker subscription can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](../../support/index.md).

* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](../settings/mac-settings.md#kubernetes).
* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](../settings/mac.md#kubernetes).

* **Clean / Purge data**: This option resets all Docker data _without_ a
reset to factory defaults. Selecting this option results in the loss of existing settings.
Expand Down Expand Up @@ -205,7 +205,7 @@ For more about using client and server side certificates, see
If you are using mounted volumes and get runtime errors indicating an
application file is not found, access to a volume mount is denied, or a service
cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md),
you might need to enable [file sharing](../settings/mac-settings.md#file-sharing).
you might need to enable [file sharing](../settings/mac.md#file-sharing).

Volume mounting requires shared drives for projects that live outside of the
`/Users` directory. Go to ![whale menu](images/whale-x.png){: .inline} >
Expand Down
6 changes: 3 additions & 3 deletions desktop/networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ syntax for `-p` is `HOST_PORT:CLIENT_PORT`.
### HTTP/HTTPS Proxy Support

See:
- [Proxies on Linux](settings/linux-settings.md#proxies)
- [Proxies on Mac](settings/mac-settings.md#proxies)
- [Proxies on Windows](settings/windows-settings.md#proxies)
- [Proxies on Linux](settings/linux.md#proxies)
- [Proxies on Mac](settings/mac.md#proxies)
- [Proxies on Windows](settings/windows.md#proxies)

## Features for Mac and Linux

Expand Down
2 changes: 1 addition & 1 deletion desktop/previous-versions/2.x-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
- Fixed a race condition when starting the WSL engine which caused Docker Desktop to incorrectly report that the containers have exited. Fixes [docker/for-win#5607](https://github.com/docker/for-win/issues/5607).
- Fixed an issue where editing code inside a container resulted in an error. Fixes [docker/for-win#5528](https://github.com/docker/for-win/issues/5528).
- Fixed a bug where running the command `DockerCli.exe -SharedDrives` failed to display a list of drives that are shared. Fixes [docker/for-win#5625](https://github.com/docker/for-win/issues/5625).
- Starting with Docker Desktop 2.2.0.3, you must access all shared files using their original case. For example, if you have created a file called `test`, you must open it as `test`. Attempts to open the file as `Test` will fail with the error `No such file or directory`. For more information, see _Tips on shared drives, permissions, and volume mounts_ in [File sharing](../settings/windows-settings.md#file-sharing).
- Starting with Docker Desktop 2.2.0.3, you must access all shared files using their original case. For example, if you have created a file called `test`, you must open it as `test`. Attempts to open the file as `Test` will fail with the error `No such file or directory`. For more information, see _Tips on shared drives, permissions, and volume mounts_ in [File sharing](../settings/windows.md#file-sharing).

### Known issues

Expand Down
4 changes: 2 additions & 2 deletions desktop/previous-versions/edge-releases-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -1868,9 +1868,9 @@ TCP connection is idle for more than five minutes (related to

**New**

- Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](../settings/mac-settings.md#docker-engine).
- Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](../settings/mac.md#docker-engine).

- Docker Experimental mode can be toggled. See [Daemon Basic (experimental mode and registries)](../settings/mac-settings.md#docker-engine).
- Docker Experimental mode can be toggled. See [Daemon Basic (experimental mode and registries)](../settings/mac.md#docker-engine).

**Upgrades**

Expand Down
2 changes: 1 addition & 1 deletion desktop/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/ge

#### For Mac

- Docker Desktop 4.6.0 gives macOS users the option of enabling a new experimental file sharing technology called VirtioFS. During testing VirtioFS has been shown to drastically reduce the time taken to sync changes between the host and VM, leading to substantial performance improvements. For more information, see [VirtioFS](settings/mac-settings.md#experimental-features).
- Docker Desktop 4.6.0 gives macOS users the option of enabling a new experimental file sharing technology called VirtioFS. During testing VirtioFS has been shown to drastically reduce the time taken to sync changes between the host and VM, leading to substantial performance improvements. For more information, see [VirtioFS](settings/mac.md#experimental-features).

### Upgrades

Expand Down
Loading