Merge pull request #13626 from docker/master

Publish updates from master

_includes/desktop-update.md

@@ -1,6 +1,8 @@
 <!-- This text will be included in the Mac and Windows Install topic -->
 
-When an update is available, Docker Desktop displays an icon to indicate the availability of a newer version. You can choose when to start the download and installation process.
+When an update is available, Docker Desktop displays an icon to indicate the availability of a newer version.
+
+Starting with Docker Desktop 4.1.0, the **Software Updates** section in the [General](../#general) tab also notifies you of any updates available to Docker Desktop. You can choose to download the update right away, or click the **Release Notes** option to learn what's included in the updated version. If you are on a Docker Team or a Business subscription, you can turn off the check for updates by clearing the **Automatically Check for Updates** checkbox in the [General](../#general) settings. This will also disable the notification badge that appears on the Docker Dashboard.
 
 To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option.
 

_includes/landing-page/volume-management.html

@@ -0,0 +1,19 @@
+<section class="cta-banner">
+  <div class="container">
+    <div class="row">
+      <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
+        <h2>
+          Volume Management is now free in Docker Desktop
+        </h2>
+        <h5>
+          Thanks for your positive support on the <a href="https://www.docker.com/blog/updating-product-subscriptions/" target="_blank" rel="noopener" id="dkr_docs_subscription_btl">Docker subscription updates</a>. We are now able to deliver more value to all users, starting with making Volume Management available for users on any subscription, including Docker Personal. Update your Docker Desktop to 4.1 to start managing your volumes.
+        </h5>
+      </div>
+      <div class="col-xs-12 col-md-6 col-lg-4 text-center">
+        <a class="btn" href="https://docs.docker.com/desktop/dashboard/#explore-volumes" target="_blank" rel="noopener">
+          Learn more
+        </a>
+      </div>
+    </div>
+  </div>
+</section>

_layouts/landing.html

@@ -143,7 +143,7 @@
     </div>
   </section>
 
-  {% include landing-page/docker-pricing.html %}
+  {% include landing-page/volume-management.html %}
 
   <section class="container help-by-product">
     <div class="row">

desktop/dashboard.md

@@ -229,26 +229,12 @@ To interact with remote repositories:
 
 You can use [volumes](../storage/volumes.md) to store files and share them among containers. Volumes are created and are directly managed by Docker. They are also the preferred mechanism to persist data in Docker containers and services.
 
-The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. If you are user with a paid Docker subscription, you can also see which container is using a specific volume and explore the files and folders in your volumes.
+> **Volume Management is now available for all subscriptions**
+>
+> Starting with Docker Desktop 4.1.0 release, Volume management is available for users on any subscription, including Docker Personal. Update Docker Desktop to 4.1.0 to start managing your volumes for free.
+{: .important}
 
-{% include upgrade-cta.html
+The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. You can also see which container is using a specific volume and explore the files and folders in your volumes.
-  body="To start exploring the details in your volumes, upgrade to a Docker Pro, Team, or a Business subscription."
-  header-text="This feature requires a paid Docker subscription"
-  target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_volumes"
-%}
-
-The following table lists the Volumes UI features available in each plan:
-
-{% assign yes = '![yes](/images/green-check.svg){: .inline style="height: 14px; margin: 0 auto"}' %}
-
-| Feature                                       | Personal      | Pro       | Team      | Business      | 
-|:----------------------------------------------|:---------:|:---------:|:--------:|:--------:|
-|  View, create, and delete volumes             | {{ yes }} | {{ yes }} |  {{ yes }}  |  {{ yes }}  |
-| See which volumes are in use                  | {{ yes }} | {{ yes }} |  {{ yes }}  |  {{ yes }}  |
-| See the size of the volume                    | {{ yes }} | {{ yes }} |  {{ yes }}  |  {{ yes }}  |
-| See volume data details (modified date, size) | X         | {{ yes }} |  {{ yes }}  |  {{ yes }}  |
-| See which container is using a volume         | X         | {{ yes }} |  {{ yes }}  |  {{ yes }}  |
-| Save or delete files from a volume            | X         | {{ yes }} |  {{ yes }}  |  {{ yes }}  |
 
 ### Manage volumes
 

desktop/mac/index.md

@@ -55,6 +55,8 @@ On the **General** tab, you can configure when to start and update Docker:
 
 - **Open Docker Desktop dashboard at startup**: Automatically opens the dashboard when starting Docker Desktop.
 
+- **Use Docker Compose V2**: Select this option to enable the `docker-compose` command to use Docker Compose V2. For more information, see [Docker Compose V2](../../compose/cli-command.md).
+
 ### Resources
 
 The **Resources** tab allows you to configure CPU, memory, disk, proxies, network, and other resources.
@@ -223,6 +225,12 @@ For more information about using the Kubernetes integration with Docker Desktop,
 
 For information about the reset options, see [Logs and Troubleshooting](troubleshoot.md).
 
+### Software Updates
+
+The Software Updates section notifies you of any updates available to Docker Desktop. You can choose to download the update right away, or click the **Release Notes** option to learn what's included in the updated version.
+
+If you are on a Docker Team or a Business subscription, you can turn off the check for updates by clearing the **Automatically Check for Updates** checkbox in the [General](#general) settings. This will also disable the notification badge that appears on the Docker Dashboard.
+
 ## Dashboard
 
 The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md).

desktop/mac/release-notes.md

@@ -17,14 +17,38 @@ toc_max: 2
 
 This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
 
-## Docker Desktop 4.0.1
+## Docker Desktop 4.1.0
-2021-09-13
+2021-09-30
 
 > Download Docker Desktop
 >
 > [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn }
 > [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
 
+### New
+
+- **Software Updates**: The Settings tab now includes a new section to help you manage Docker Desktop updates. The **Software Updates** section notifies you whenever there's a new update and allows you to download the update or view information on what's included in the newer version. For more information, see [Software Updates](../#software-updates).
+- **Compose V2** You can now specify whether to use [Docker Compose V2](../../compose/cli-command.md) in the General settings.
+- **Volume Management**: Volume management is now available for users on any subscription, including Docker Personal. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
+
+### Upgrades
+
+- [Compose V2](https://github.com/docker/compose/releases/tag/v2.0.0)
+- [Buildx 0.6.3](https://github.com/docker/buildx/releases/tag/v0.6.3)
+- [Kubernetes 1.21.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.5)
+- [Go 1.17.1](https://github.com/golang/go/releases/tag/go1.17.1)
+- [Alpine 3.14](https://alpinelinux.org/posts/Alpine-3.14.0-released.html)
+- [Qemu 6.1.0](https://wiki.qemu.org/ChangeLog/6.1)
+- Base distro to debian:bullseye
+
+## Docker Desktop 4.0.1
+2021-09-13
+
+> Download Docker Desktop
+>
+> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/68347/Docker.dmg) |
+> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/68347/Docker.dmg)
+
 ### Upgrades
 
 - [Compose V2 RC3](https://github.com/docker/compose/releases/tag/v2.0.0-rc.3)

desktop/mac/troubleshoot.md

@@ -116,27 +116,23 @@ To view the contents of the diagnostic file, run:
 $ open /tmp/BE9AFAAF-F68B-41D0-9D12-84760E6B8740/20190905152051.zip
 ```
 
-### Experimental self-diagnose tool
+### Self-diagnose tool
 
-Docker Desktop 3.6.0 contains an experimental "self-diagnose" tool which helps identify some common
+Docker Desktop contains a self-diagnose tool which helps you to identify some common problems. Before you run the self-diagnose tool, locate `com.docker.diagnose`. If you have installed Docker Desktop
-problems. To run it: first locate `com.docker.diagnose`. If you have installed Docker Desktop
+in the Applications directory, then the self-diagnose tool will be located at
-in the Applications directory, then it is located at
 `/Applications/Docker.app/Contents/MacOS/com.docker.diagnose`.
 
-To run the self-diagnose tool:
+To run the self-diagnose tool, run:
 
 ```console
 $ /Applications/Docker.app/Contents/MacOS/com.docker.diagnose check
 ```
 
-The tool runs a suite of checks and displays **PASS** or **FAIL** next to each one. If there are any failures, it highlights the most relevant at the end.
+The tool runs a suite of checks and displays **PASS** or **FAIL** next to each check. If there are any failures, it highlights the most relevant at the end of the report.
-it will try to highlight the most relevant at the end.
 
-> **Note**
+> **Feedback**
 >
-> The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-mac](https://github.com/docker/for-mac/issues) GitHub repository.
+> Let us know your feedback on the self-diagnose tool by creating an issue in the [for-mac](https://github.com/docker/for-mac/issues) GitHub repository.
-
-The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-mac](https://github.com/docker/for-mac/issues) GitHub repository.
 
 <a name="logs"></a>
 

desktop/windows/index.md

@@ -40,7 +40,7 @@ This section explains the configuration options accessible from the **Settings**
 
 On the **General** tab of the Settings dialog, you can configure when to start and update Docker.
 
-![Settings](../mac/images/menu/prefs-general.png){:width="750px"}
+![Settings](images/settings-general.png){:width="750px"}
 
 - **Automatically check for updates**: By default, Docker Desktop is configured to check for newer versions automatically. If you have installed Docker Desktop as part of an organization, you may not be able to update Docker Desktop yourself. In that case, [upgrade your existing organization to a Team plan](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade) and clear this checkbox to disable the automatic check for updates.
 
@@ -58,6 +58,8 @@ troubleshoot the application. Clear the check box to opt out. Docker may periodi
 
 - **Open Docker Desktop dashboard at startup**: Automatically opens the dashboard when starting Docker Desktop.
 
+- **Use Docker Compose V2**: Select this option to enable the `docker-compose` command to use Docker Compose V2. For more information, see [Docker Compose V2](../../compose/cli-command.md).
+
 ### Resources
 
 The **Resources** tab allows you to configure CPU, memory, disk, proxies,
@@ -65,8 +67,6 @@ network, and other resources. Different settings are available for
 configuration depending on whether you are using Linux containers in WSL 2
 mode, Linux containers in Hyper-V mode, or Windows containers.
 
-![Resources](images/settings-resources.png){:width="750px"}
-
 #### Advanced
 
 > **Note**
@@ -74,7 +74,8 @@ mode, Linux containers in Hyper-V mode, or Windows containers.
 > The Advanced tab is only available in Hyper-V mode, because in WSL 2 mode and 
 > Windows container mode these resources are managed by Windows. In WSL 2 
 > mode, you can configure limits on the memory, CPU, and swap size allocated
-> to the [WSL 2 utility VM](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig).
+> to the [WSL 2 utility VM](https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig){:target="_blank"
+class="_"}.
 
 Use the **Advanced** tab to limit resources available to Docker.
 
@@ -270,6 +271,12 @@ that you can test deploying your Docker workloads on Kubernetes. To enable Kuber
 
 For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../kubernetes.md){:target="_blank" rel="noopener" class="_"}.
 
+### Software Updates
+
+The Software Updates section notifies you of any updates available to Docker Desktop. You can choose to download the update right away, or click the **Release Notes** option to learn what's included in the updated version.
+
+If you are on a Docker Team or a Business subscription, you can turn off the check for updates by clearing the **Automatically Check for Updates** checkbox in the [General](#general) settings. This will also disable the notification badge that appears on the Docker Dashboard.
+
 ### Reset
 
 The **Restart Docker Desktop** and **Reset to factory defaults** options are now available on the **Troubleshoot** menu. For information, see [Logs and Troubleshooting](troubleshoot.md).

desktop/windows/release-notes.md

@@ -17,12 +17,46 @@ toc_max: 2
 
 This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
 
+## Docker Desktop 4.1.0
+2021-09-30
+
+> Download Docker Desktop
+>
+> [For Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn }
+
+### New
+
+- **Software Updates**: The Settings tab now includes a new section to help you manage Docker Desktop updates. The **Software Updates** section notifies you whenever there's a new update and allows you to download the update or view information on what's included in the newer version. For more information, see [Software Updates](../#software-updates).
+- **Compose V2** You can now specify whether to use [Docker Compose V2](../../compose/cli-command.md) in the General settings.
+- **Volume Management**: Volume management is now available for users on any subscription, including Docker Personal. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
+
+### Upgrades
+
+- [Compose V2](https://github.com/docker/compose/releases/tag/v2.0.0)
+- [Buildx 0.6.3](https://github.com/docker/buildx/releases/tag/v0.6.3)
+- [Kubernetes 1.21.5](https://github.com/kubernetes/kubernetes/releases/tag/v1.21.5)
+- [Go 1.17.1](https://github.com/golang/go/releases/tag/go1.17.1)
+- [Alpine 3.14](https://alpinelinux.org/posts/Alpine-3.14.0-released.html)
+- [Qemu 6.1.0](https://wiki.qemu.org/ChangeLog/6.1)
+- Base distro to debian:bullseye
+
+### Bug fixes and minor changes
+
+- Fixed a bug related to anti-malware software triggering, self-diagnose avoids calling the `net.exe` utility.
+- Fixed filesystem corruption in the WSL 2 Linux VM in self-diagnose. This can be caused by [microsoft/WSL#5895](https://github.com/microsoft/WSL/issues/5895).
+- Fixed `SeSecurityPrivilege` requirement issue. See [docker/for-win#12037](https://github.com/docker/for-win/issues/12037).
+- Fixed CLI context switch sync with UI. See [docker/for-win#11721](https://github.com/docker/for-win/issues/11721).
+- Added the key `vpnKitMaxPortIdleTime` to `settings.json` to allow the idle network connection timeout to be disabled or extended.
+- Fixed a crash on exit. See [docker/for-win#12128](https://github.com/docker/for-win/issues/12128).
+- Fixed a bug where the CLI tools would not be available in WSL 2 distros.
+- Fixed switching from Linux to Windows containers that was stuck because access rights on panic.log. See [for-win#11899](https://github.com/docker/for-win/issues/11899).
+ 
 ## Docker Desktop 4.0.1
 2021-09-13
 
 > Download Docker Desktop
 >
-> [For Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn }
+> [For Windows](https://desktop.docker.com/win/main/amd64/68347/Docker Desktop Installer.exe)
 
 ### Upgrades
 

desktop/windows/troubleshoot.md

@@ -83,10 +83,10 @@ Diagnostics Bundle: C:\Users\User\AppData\Local\Temp\CD6CF862-9CBD-4007-9C2F-5FB
 Diagnostics ID:     CD6CF862-9CBD-4007-9C2F-5FBE0572BBC2/20180720152545 (uploaded)
 ```
 
-### Experimental self-diagnose tool
+### Self-diagnose tool
 
-Docker Desktop 3.6.0 contains an experimental "self-diagnose" tool which helps identify some common
+Docker Desktop contains a self-diagnose tool which helps you to identify some common
-problems. To run it: first locate `com.docker.diagnose.exe`, usually installed in `C:\Program
+problems. Before you run the self-diagnose tool, locate `com.docker.diagnose.exe`. This is usually installed in `C:\Program
 Files\Docker\Docker\resources\com.docker.diagnose.exe`.
 
 To run the self-diagnose tool in Powershell:
@@ -95,14 +95,11 @@ To run the self-diagnose tool in Powershell:
 PS C:\> & "C:\Program Files\Docker\Docker\resources\com.docker.diagnose.exe" check
 ```
 
-The tool runs a suite of checks and displays **PASS** or **FAIL** next to each one. If there are any failures, it highlights the most relevant at the end.
+The tool runs a suite of checks and displays **PASS** or **FAIL** next to each check. If there are any failures, it highlights the most relevant at the end.
-it will try to highlight the most relevant at the end.
 
-> **Note**
+> **Feedback**
 >
-> The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-win](https://github.com/docker/for-win/issues) GitHub repository.
+> Let us know your feedback on the self-diagnose tool by creating an issue in the [for-win](https://github.com/docker/for-win/issues) GitHub repository.
-
-The Self-diagnose tool is still experimental. Let us know your feedback by creating an issue in the [for-win](https://github.com/docker/for-win/issues) GitHub repository.
 
 ## Troubleshooting topics