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
5 changes: 1 addition & 4 deletions content/get-started/workshop/06_bind_mounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ work.

1. Verify that your `getting-started-app` directory is in a directory defined in
Docker Desktop's file sharing setting. This setting defines which parts of your
filesystem you can share with containers. For details about accessing the
setting, see the topic for [Mac](/manuals/desktop/settings/mac.md#file-sharing),
[Windows](/manuals/desktop/settings/windows.md#file-sharing), or
[Linux](/manuals/desktop/settings/linux.md#file-sharing).
filesystem you can share with containers. For details about accessing the setting, see [File sharing](/manuals/desktop/settings.md#file-sharing).

2. Open a terminal and change directory to the `getting-started-app`
directory.
Expand Down
5 changes: 0 additions & 5 deletions content/includes/beta.md

This file was deleted.

63 changes: 0 additions & 63 deletions content/includes/desktop-builders-setting.md

This file was deleted.

3 changes: 0 additions & 3 deletions content/includes/desktop-experimental.md

This file was deleted.

1 change: 0 additions & 1 deletion content/includes/desktop-network-setting.md

This file was deleted.

9 changes: 0 additions & 9 deletions content/includes/desktop-notifications-settings.md

This file was deleted.

6 changes: 1 addition & 5 deletions content/manuals/build/builders/manage.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,4 @@ It only removes your connection to the builder.

If you have turned on the
[Docker Desktop Builds view](/manuals/desktop/use-desktop/builds.md),
you can inspect builders in Docker Desktop settings. See:

- [Change settings, Windows](/manuals/desktop/settings/windows.md#builders)
- [Change settings, Mac](/manuals/desktop/settings/mac.md#builders)
- [Change settings, Linux](/manuals/desktop/settings/linux.md#builders)
you can inspect builders in [Docker Desktop settings](/manuals/desktop/settings.md#builders).
4 changes: 2 additions & 2 deletions content/manuals/desktop/faqs/windowsfaqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ No, running Docker Desktop on Windows Server is not supported.
### 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.md#file-sharing) for
the Unix-style permissions on [shared volumes](/manuals/desktop/settings.md#file-sharing) for
deployed containers, but rather sets permissions to a default value of
[0777](https://chmodcommand.com/chmod-0777/)
(`read`, `write`, `execute` permissions for `user` and for
Expand Down Expand Up @@ -69,7 +69,7 @@ You need to restart Docker Desktop after making any changes to the keychain
or to the `~/.docker/certs.d` directory in order for the changes to take effect.

The registry cannot be listed as an insecure registry (see
[Docker Daemon](../settings/windows.md#docker-engine)). Docker Desktop ignores
[Docker Daemon](/manuals/desktop/settings.md#docker-engine)). Docker Desktop ignores
certificates listed under insecure registries, and does not send client
certificates. Commands like `docker run` that attempt to pull from the registry
produce error messages on the command line, as well as on the registry.
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/desktop/install/linux-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Docker Desktop for Linux provides a user-friendly graphical interface that simpl
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 and offers
controls to restrict [its resources](../settings/linux.md#resources). Using a dedicated storage
controls to restrict [its resources](/manuals/desktop/settings.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
2 changes: 1 addition & 1 deletion content/manuals/desktop/install/mac-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ This page contains download URLs, information about system requirements, and ins

6. From the installation window, select either:
- **Use recommended settings (Requires password)**. This lets Docker Desktop automatically set the necessary configuration settings.
- **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](../settings/mac.md#advanced), for more information and how to set the location of the Docker CLI tools.
- **Use advanced settings**. You can then set the location of the Docker CLI tools either in the system or user directory, enable the default Docker socket, and enable privileged port mapping. See [Settings](/manuals/desktop/settings.md#advanced), for more information and how to set the location of the Docker CLI tools.
7. Select **Finish**. If you have applied any of the previous configurations that require a password in step 6, enter your password to confirm your choice.

### Install from the command line
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/desktop/mac/permission-requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ The Docker binaries are installed by default in `/Applications/Docker.app/Conten

With version 4.18 and later, you can choose whether to install symlinks either in `/usr/local/bin` or `$HOME/.docker/bin` during installation of Docker Desktop.

If `/usr/local/bin` is chosen, and this location is not writable by unprivileged users, Docker Desktop requires authorization to confirm this choice before the symlinks to Docker binaries are created in `/usr/local/bin`. If `$HOME/.docker/bin` is chosen, authorization is not required, but then you must [manually add `$HOME/.docker/bin`](../settings/mac.md#advanced) to their PATH.
If `/usr/local/bin` is chosen, and this location is not writable by unprivileged users, Docker Desktop requires authorization to confirm this choice before the symlinks to Docker binaries are created in `/usr/local/bin`. If `$HOME/.docker/bin` is chosen, authorization is not required, but then you must [manually add `$HOME/.docker/bin`](/manuals/desktop/settings.md#advanced) to their PATH.

You are also given the option to enable the installation of the `/var/run/docker.sock` symlink. Creating this symlink ensures various Docker clients relying on the default Docker socket path work without additional changes.

Expand Down
5 changes: 1 addition & 4 deletions content/manuals/desktop/networking.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ syntax for `-p` is `HOST_PORT:CLIENT_PORT`.

### HTTP/HTTPS Proxy support

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

### SOCKS5 proxy support

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/desktop/previous-versions/2.x-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,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.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](/manuals/desktop/settings.md#file-sharing).

### Known issues

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1560,9 +1560,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.md#docker-engine).
- Dedicated preference pane for advanced configuration of the docker daemon (edit daemon.json). See [Daemon Advanced (JSON configuration file)](/manuals/desktop/settings.md#docker-engine).

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

**Upgrades**

Expand Down
14 changes: 7 additions & 7 deletions content/manuals/desktop/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ For more information, see [microsoft/WSL#11794](https://github.com/microsoft/WSL

#### For Windows

- Added support for [Kerberos and NTLM proxy authentication](settings/windows.md#proxy-authentication) on Windows. Requires a Business subscription.
- Added support for [Kerberos and NTLM proxy authentication](/manuals/desktop/settings.md#proxy-authentication) on Windows. Requires a Business subscription.

### Upgrades

Expand Down Expand Up @@ -861,7 +861,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

### New

- Rosetta is now Generally Available for all users on macOS 13 or later. It provides faster emulation of Intel-based images on Apple Silicon. To use Rosetta, see [Settings](settings/mac.md). Rosetta is enabled by default on macOS 14.1 and later.
- Rosetta is now Generally Available for all users on macOS 13 or later. It provides faster emulation of Intel-based images on Apple Silicon. To use Rosetta, see [Settings](/manuals/desktop/settings.md). Rosetta is enabled by default on macOS 14.1 and later.
- Docker Desktop now detects if a WSL version is out of date. If an out dated version of WSL is detected, you can allow Docker Desktop to automatically update the installation or you can manually update WSL outside of Docker Desktop.
- New installations of Docker Desktop for Windows now require a Windows version of 19044 or later.
- Administrators now have the ability to control Docker Scout image analysis in [Settings Management](/manuals/security/for-admins/hardened-desktop/settings-management/configure.md).
Expand Down Expand Up @@ -922,7 +922,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

#### For Windows

- **Switch to Windows containers** option in the tray menu may not show up on Windows. As a workaround, edit the [`settings.json` file](https://docs.docker.com/desktop/settings/windows/) and set `"displaySwitchWinLinContainers": true`.
- **Switch to Windows containers** option in the tray menu may not show up on Windows. As a workaround, edit the [`settings.json` file](/manuals/desktop/settings.md) and set `"displaySwitchWinLinContainers": true`.

#### For all platforms

Expand Down Expand Up @@ -1150,13 +1150,13 @@ This can be resolved by adding the user to the **docker-users** group. Before st
#### For Mac

- Fixed a bug that prevented Docker Desktop from starting. [docker/for-mac#6890](https://github.com/docker/for-mac/issues/6890)
- Resource Saver is now available on Mac. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](settings/mac.md) in settings.
- Resource Saver is now available on Mac. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](/manuals/desktop/settings.md) in settings.

#### For Windows

- Fixed a bug where the self-diagnose tool showed a false-positive failure when vpnkit is expected to be not running. Fixes [docker/for-win#13479](https://github.com/docker/for-win/issues/13479).
- Fixed a bug where an invalid regular expression in the search bar caused an error. Fixes [docker/for-win#13592](https://github.com/docker/for-win/issues/13592).
- Resource Saver is now available on Windows Hyper-V. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](settings/windows.md) in settings.
- Resource Saver is now available on Windows Hyper-V. It optimises Docker Desktop's usage of your system resources when no containers are running. To access this feature, make sure you have [turned on access to experimental features](/manuals/desktop/settings.md) in settings.

## 4.21.1

Expand Down Expand Up @@ -1268,7 +1268,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

- Fixed a bug that meant WSL data could not be moved to a different disk. Fixes [docker/for-win#13269](https://github.com/docker/for-win/issues/13269).
- Fixed a bug where Docker Desktop was not stopping its WSL distros (docker-desktop and docker-desktop-data) when it was shutdown, consuming host memory unnecessarily.
- Added a new setting that allows the Windows Docker daemon to use Docker Desktop's internal proxy when running Windows containers. See [Windows proxy settings](settings/windows.md#proxies).
- Added a new setting that allows the Windows Docker daemon to use Docker Desktop's internal proxy when running Windows containers. See [Windows proxy settings](/manuals/desktop/settings.md#proxies).

#### For Linux

Expand Down Expand Up @@ -2297,7 +2297,7 @@ This can be resolved by adding the user to the **docker-users** group. Before st

#### 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.md#beta-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](/manuals/desktop/settings.md#beta-features).

### Updates

Expand Down
Loading