From 6488f1465ef1100282b572a00bee7a6fdf8e0eff Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:14:17 +0100 Subject: [PATCH] ENGDOCS-2159 (#20453) * ENGDOCS-2159 * changes to release * changes to release --- content/desktop/settings/linux.md | 8 ++++++++ content/desktop/settings/mac.md | 10 +++++++++- content/desktop/settings/windows.md | 16 +++++++++++----- content/includes/desktop-network-setting.md | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/content/desktop/settings/linux.md b/content/desktop/settings/linux.md index 916002ec01..eb28b12258 100644 --- a/content/desktop/settings/linux.md +++ b/content/desktop/settings/linux.md @@ -107,6 +107,14 @@ Use File sharing to allow local directories on your machine to be shared with Linux containers. This is especially useful for editing source code in an IDE on the host while running and testing the code in a container. +#### Synchronized file shares + +Synchronized file shares is an alternative file sharing mechanism that provides fast and flexible host-to-VM file sharing, enhancing bind mount performance through the use of synchronized filesystem caches. Available with Pro, Team, and Business subscriptions. + +To learn more, see [Synchronized file share](../synchronized-file-sharing.md). + +#### Virtual file shares + By default the `/home/` directory is shared. If your project is outside this directory then it must be added to the list, otherwise you may get `Mounts denied` or `cannot start service` errors at runtime. diff --git a/content/desktop/settings/mac.md b/content/desktop/settings/mac.md index 9687121a40..9d0838f60b 100644 --- a/content/desktop/settings/mac.md +++ b/content/desktop/settings/mac.md @@ -139,6 +139,14 @@ Use File sharing to allow local directories on your machine to be shared with Linux containers. This is especially useful for editing source code in an IDE on the host while running and testing the code in a container. +#### Synchronized file shares + +Synchronized file shares is an alternative file sharing mechanism that provides fast and flexible host-to-VM file sharing, enhancing bind mount performance through the use of synchronized filesystem caches. Available with Pro, Team, and Business subscriptions. + +To learn more, see [Synchronized file share](../synchronized-file-sharing.md). + +#### Virtual file shares + By default the `/Users`, `/Volumes`, `/private`, `/tmp` and `/var/folders` directory are shared. If your project is outside this directory then it must be added to the list, otherwise you may get `Mounts denied` or `cannot start service` errors at runtime. @@ -218,7 +226,7 @@ The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY {{< include "desktop-network-setting.md" >}} -You can also select **Use kernel networking for UDP**. This lets you use a more efficient kernel networking path for UDP by changing the value of `kernelForUDP` in the `settings.json` file. +You can also select the **Use kernel networking for UDP** setting. This lets you use a more efficient kernel networking path for UDP. This may not be compatible with your VPN software. ## Docker Engine diff --git a/content/desktop/settings/windows.md b/content/desktop/settings/windows.md index 26adcbb1e4..e344606349 100644 --- a/content/desktop/settings/windows.md +++ b/content/desktop/settings/windows.md @@ -128,6 +128,14 @@ Advanced settings are: > The **File sharing** tab is only available in Hyper-V mode because the files > are automatically shared in WSL 2 mode and Windows container mode. +#### Synchronized file shares + +Synchronized file shares is an alternative file sharing mechanism that provides fast and flexible host-to-VM file sharing, enhancing bind mount performance through the use of synchronized filesystem caches. Available with Pro, Team, and Business subscriptions. + +To learn more, see [Synchronized file share](../synchronized-file-sharing.md). + +#### Virtual file shares + Use File sharing to allow local directories on your machine to be shared with Linux containers. This is especially useful for editing source code in an IDE on the host while running and testing the code in a container. @@ -236,12 +244,10 @@ Developers are no longer interrupted by prompts for proxy credentials as authent If your proxy offers multiple authentication schemes in 407(Proxy Authentication Required) response, Docker Desktop by default selects Basic authentication scheme. If your proxy server is properly configured for Kerberos or NTLM authentication, you can enable Kerberos/NTLM proxy authentication during Docker Desktop installation. To do that, you will have install Docker Deskop from command line and pass the installer flag '--proxy-enable-kerberosntlm'. Available with Docker Desktop 4.32 and later. - > **Note** > > Docker Desktop also supports the use of [SOCKS5 proxies](../networking.md#socks5-proxy-support). - ### Network > **Note** @@ -332,7 +338,7 @@ when an update becomes available. After downloading the update, select **Apply and Restart** to install the update. You can do this either through the Docker menu or in the **Updates** section in the Docker Dashboard. -## Features in development +## Extensions Use the **Extensions** tab to: @@ -342,9 +348,9 @@ Use the **Extensions** tab to: For more information about Docker extensions, see [Extensions](../extensions/index.md). -## Feature control +## Features in development -On the **Feature control** tab you can control your settings for **Beta features** and **Experimental features**. +On the **Features in development** tab you can control your settings for **Beta features** and **Experimental features**. You can also sign up to the [Developer Preview Program](https://www.docker.com/community/get-involved/developer-preview/) from the **Features in development** tab. diff --git a/content/includes/desktop-network-setting.md b/content/includes/desktop-network-setting.md index 16af8f7c95..6b325622be 100644 --- a/content/includes/desktop-network-setting.md +++ b/content/includes/desktop-network-setting.md @@ -1 +1 @@ -Docker Desktop uses a private IPv4 network for internal services such as a DNS server and an HTTP proxy. In case Docker Desktop's choice of subnet clashes with IPs in your environment, you can specify a custom subnet using the **Network** setting. \ No newline at end of file +Docker Desktop uses a private IPv4 network for internal services such as a DNS server and an HTTP proxy. In case Docker Desktop's choice of subnet clashes with IPs in your environment, you can specify a custom subnet using the **Network** setting.