Merge pull request #13814 from docker/master

Publish updates from master

_includes/desktop-update.md

@@ -1,10 +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.
+When an update is available, Docker Desktop displays an icon on the Docker menu to indicate the availability of a newer version. Additionally, the **Software Updates** section in **Preferences** (**Settings** on Windows) 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.
 
-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.
+Starting with Docker Desktop 4.2.0, the option to turn off the automatic check for updates is available for users on all Docker subscriptions, including Docker Personal and Docker Pro. For more information, see [Software Updates](../#software-updates).
 
 > **Docker Subscription Service Agreement**
 >

desktop/mac/index.md

@@ -33,15 +33,11 @@ and more.
 Choose the Docker menu ![whale menu](images/whale-x.png){: .inline} > **Preferences** from the
 menu bar and configure the runtime options described below.
 
-![Docker context menu](images/menu/prefs.png){:width="250px"}
-
 ### General
 
 ![Preferences](images/menu/prefs-general.png){:width="750px"}
 
-On the **General** tab, you can configure when to start and update Docker:
-
-- **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.
+On the **General** tab, you can configure when to start Docker and specify other settings:
 
 - **Start Docker Desktop when you log in**: Automatically starts Docker Desktop when you open your session.
 
@@ -227,13 +223,20 @@ For information about the reset options, see [Logs and Troubleshooting](troubles
 
 ### 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.
+The **Software Updates** section notifies you of any updates available to Docker Desktop. When there's a new update, 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.
+> **Disable automatic check for updates**
+>
+> Starting with Docker Desktop 4.2.0, the option to turn off the automatic check for updates is available for users on all Docker subscriptions, including Docker Personal and Docker Pro. Update to [Docker Desktop 4.2.0](../mac/release-notes/index.md) to start using this feature.
+{: .important}
+
+Turn off the check for updates by clearing the **Automatically Check for Updates** check box. This disables notifications in the Docker menu and also the notification badge that appears on the Docker Dashboard. To check for updates manually, select the **Check for updates** option in the Docker menu.
+
+To allow Docker Desktop to automatically download new updates in the background, select **Always download updates**. This downloads newer versions of Docker Desktop when an update becomes available. After downloading the update, click **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.
 
 ## 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).
+The Docker 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 Dashboard](../dashboard.md).
 
 ## Add TLS certificates
 
@@ -403,19 +406,6 @@ $ ln -shi /Applications/Docker.app/Contents/Resources/etc/docker.fish-completion
 $ ln -shi /Applications/Docker.app/Contents/Resources/etc/docker-compose.fish-completion ~/.config/fish/completions/docker-compose.fish
 ```
 
-## Give feedback and get help
-
-To get help from the community, review current user topics, join or start a
-discussion, log on to our [Docker Desktop for Mac
-forum](https://forums.docker.com/c/docker-for-mac){:target="_blank" rel="noopener" class="_"}.
-
-To report bugs or problems, log on to Docker Desktop [for Mac issues on
-GitHub](https://github.com/docker/for-mac/issues){:target="_blank" rel="noopener" class="_"},
-where you can review community reported issues, and file new ones.  See
-[Logs and Troubleshooting](troubleshoot.md) for more details.
-
-For information about providing feedback on the documentation or update it yourself, see [Contribute to documentation](/opensource/).
-
 ## Docker Hub
 
 Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories and organizations directly from the Docker Desktop menu.
@@ -444,6 +434,35 @@ After you have enabled two-factor authentication:
 
 After you have successfully authenticated, you can access your organizations and repositories directly from the Docker Desktop menu.
 
+## Pause/Resume
+
+Starting with the Docker Desktop 4.2 release, you can pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. When you pause Docker Desktop, the Linux VM running Docker Engine is paused, the current state of all your containers are saved in memory, and all processes are frozen. This reduces the CPU usage and helps you retain a longer battery life on your laptop. You can resume Docker Desktop when you want by clicking the Resume option.
+
+From the Docker menu, select ![whale menu](images/whale-x.png){: .inline} > **Pause** to pause Docker Desktop.
+
+![Docker context menu](images/menu/prefs.png){:width="250px"}
+
+Docker Desktop now displays the paused status on the Docker menu and on the  **Containers / Apps**, **Images**, **Volumes**, and **Dev Environment** screens on the Docker Dashboard. You can still access the **Preferences** and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop.
+
+Select ![whale menu](images/whale-x.png){: .inline} > **Resume** to resume Docker Desktop.
+
+> **Note**
+>
+> When Docker Desktop is paused, running any commands in the Docker CLI will automatically resume Docker Desktop.
+
+## Give feedback and get help
+
+To get help from the community, review current user topics, join or start a
+discussion, log on to our [Docker Desktop for Mac
+forum](https://forums.docker.com/c/docker-for-mac){:target="_blank" rel="noopener" class="_"}.
+
+To report bugs or problems, log on to Docker Desktop [for Mac issues on
+GitHub](https://github.com/docker/for-mac/issues){:target="_blank" rel="noopener" class="_"},
+where you can review community reported issues, and file new ones.  See
+[Logs and Troubleshooting](troubleshoot.md) for more details.
+
+For information about providing feedback on the documentation or update it yourself, see [Contribute to documentation](/opensource/).
+
 ## Where to go next
 
 * Try out the walkthrough at [Get Started](/get-started/){: target="_blank"

desktop/mac/release-notes/index.md

@@ -17,14 +17,47 @@ redirect_from:
 
 This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
 
-## Docker Desktop 4.1.1
-2021-10-12
+## Docker Desktop 4.2.0
+2021-11-09
 
 > 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
+
+- **Pause/Resume**: You can now pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. For more information, see [Pause/Resume](../index.md#pauseresume).
+- **Software Updates**: The option to turn off automatic check for updates is now available for users on all Docker subscriptions, including Docker Personal and Docker Pro. All update-related settings have been moved to the **Software Updates** section. For more information, see [Software updates](../index.md#software-updates).
+- **Window management**: The Docker Dashboard window size and position persists when you close and reopen Docker Desktop.
+
+### Upgrades
+
+- [Docker Engine v20.10.10](https://docs.docker.com/engine/release-notes/#201010)
+- [containerd v1.4.11](https://github.com/containerd/containerd/releases/tag/v1.4.11)
+- [runc v1.0.2](https://github.com/opencontainers/runc/releases/tag/v1.0.2)
+- [Go 1.17.2](https://golang.org/doc/go1.17)
+- [Compose CLI v2.1.1](https://github.com/docker/compose/releases/tag/v2.1.1)
+- [docker-scan 0.9.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.9.0)
+
+### Bug fixes and minor changes
+
+- Improved: Self-diagnose now also checks for overlap between host IPs and `docker networks`.
+- Fixed the position of the indicator that displays the availability of an update on the Docker Dashboard.
+- Fixed an issue that caused Docker Desktop to stop responding upon clicking **Exit** on the fatal error dialog.
+- Fixed a rare startup failure affecting users having a `docker volume` bind-mounted on top of a directory from the host. If existing, this fix will also remove manually user added `DENY DELETE` ACL entries on the corresponding host directory.
+- Fixed a bug where a `Docker.qcow2` file would be ignored on upgrade and a fresh `Docker.raw` used instead, resulting in containers and images disappearing. Note that if a system has both files (due to the previous bug) then the most recently modified file will be used, to avoid recent containers and images disappearing again. To force the use of the old `Docker.qcow2`, delete the newer `Docker.raw` file. Fixes [docker/for-mac#5998](https://github.com/docker/for-mac/issues/5998).
+- Fixed a bug where subprocesses could fail unexpectedly during shutdown, triggering an unexpected fatal error popup. Fixes [docker/for-mac#5834](https://github.com/docker/for-mac/issues/5834).
+
+
+## Docker Desktop 4.1.1
+2021-10-12
+
+> Download Docker Desktop
+>
+> [Mac with Intel chip](https://desktop.docker.com/mac/main/amd64/69879/Docker.dmg) |
+> [Mac with Apple chip](https://desktop.docker.com/mac/main/arm64/69879/Docker.dmg)
+
 ### Bug fixes and minor changes
 
 > When upgrading from 4.1.0, the Docker menu does not change to **Update and restart** so you can just wait for the download to complete (icon changes) and then select **Restart**. This bug is fixed in 4.1.1, for future upgrades.

desktop/windows/index.md

@@ -38,11 +38,9 @@ This section explains the configuration options accessible from the **Settings**
 
 ### General
 
-On the **General** tab of the Settings dialog, you can configure when to start and update Docker.
+On the **General** tab, you can configure when to start Docker and specify other settings.
 
-![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.
+![Settings](/images/settings-general.png){:width="750px"}
 
 - **Start Docker when you log in**: Select this option to automatically start Docker Desktop when you log into your Windows machine.
 
@@ -273,9 +271,26 @@ For more information about using the Kubernetes integration with Docker Desktop,
 
 ### 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.
+The **Software Updates** section notifies you of any updates available to Docker Desktop. When there's a new update, 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.
+> **Disable automatic check for updates**
+>
+> Starting with Docker Desktop 4.2.0, the option to turn off the automatic check for updates is available for users on all Docker subscriptions, including Docker Personal and Docker Pro. Update to [Docker Desktop 4.2.0](../windows/release-notes/index.md) to start using this feature.
+{: .important}
+
+Turn off the check for updates by clearing the **Automatically Check for Updates** check box. This disables notifications in the Docker menu and also the notification badge that appears on the Docker Dashboard. To check for updates manually, select the **Check for updates** option in the Docker menu.
+
+To allow Docker Desktop to automatically download new updates in the background, select **Always download updates**. This downloads newer versions of Docker Desktop when an update becomes available. After downloading the update, click **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.
+
+## Dashboard
+
+The Docker 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 Dashboard](../dashboard.md).
+
+## Add TLS certificates
+
+You can add trusted Certificate Authorities (CAs) (used to verify registry
+server certificates) and client certificates (used to authenticate to
+registries) to your Docker daemon.
 
 ### Reset
 
@@ -331,7 +346,7 @@ again when you switch back.
 
 ## 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 Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md).
+The Docker 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 Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md).
 
 ## Docker Hub
 
@@ -360,6 +375,26 @@ After you have enabled two-factor authentication:
 
 After you have successfully authenticated, you can access your organizations and repositories directly from the Docker Desktop menu.
 
+## Pause/Resume
+
+Starting with the Docker Desktop 4.2 release, you can pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. When you pause Docker Desktop, the Linux VM running Docker Engine is paused, the current state of all your containers are saved in memory, and all processes are frozen. This reduces the CPU usage and helps you retain a longer battery life on your laptop. You can resume Docker Desktop when you want by clicking the Resume option.
+
+> **Note**
+>
+> The Pause/Resume feature is currently not available in the Windows containers mode.
+
+To pause Docker Desktop, right-click the Docker icon in the notifications area (or System tray) and then click **Pause**.
+
+![Docker Desktop popup menu](images/docker-menu-settings.png){:width="300px"}
+
+Docker Desktop now displays the paused status on the Docker menu and on all screens on the Docker Dashboard. You can still access the **Preferences** and the **Troubleshoot** menu from the Dashboard when you've paused Docker Desktop.
+
+Select ![whale menu](images/whale-x.png){: .inline} > **Resume** to resume Docker Desktop.
+
+> **Note**
+>
+> When Docker Desktop is paused, running any commands in the Docker CLI will automatically resume Docker Desktop.
+
 ## Adding TLS certificates
 
 You can add trusted **Certificate Authorities (CAs)** to your Docker daemon to verify registry server certificates, and **client certificates**, to authenticate to registries.

desktop/windows/release-notes/index.md

@@ -17,12 +17,44 @@ redirect_from:
 
 This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases.
 
+## Docker Desktop 4.2.0
+2021-11-09
+
+> 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
+
+- **Pause/Resume**: You can now pause your Docker Desktop session when you are not actively using it and save CPU resources on your machine. For more information, see [Pause/Resume](../index.md#pauseresume).
+- **Software Updates**: The option to turn off automatic check for updates is now available for users on all Docker subscriptions, including Docker Personal and Docker Pro. All update-related settings have been moved to the **Software Updates** section. For more information, see [Software updates](../index.md#software-updates).
+- **Window management**: The Docker Dashboard window size and position persists when you close and reopen Docker Desktop.
+
+### Upgrades
+
+- [Docker Engine v20.10.10](https://docs.docker.com/engine/release-notes/#201010)
+- [containerd v1.4.11](https://github.com/containerd/containerd/releases/tag/v1.4.11)
+- [runc v1.0.2](https://github.com/opencontainers/runc/releases/tag/v1.0.2)
+- [Go 1.17.2](https://golang.org/doc/go1.17)
+- [Compose CLI v2.1.1](https://github.com/docker/compose/releases/tag/v2.1.1)
+- [docker-scan 0.9.0](https://github.com/docker/scan-cli-plugin/releases/tag/v0.9.0)
+
+### Bug fixes and minor changes
+
+- Improved: Self-diagnose now also checks for overlap between host IPs and `docker networks`.
+- Fixed the position of the indicator that displays the availability of an update on the Docker Dashboard.
+- Fixed Docker Desktop sometimes hanging when clicking Exit in the fatal error dialog.
+- Fixed an issue that frequently displayed the **Download update** popup when an update has been downloaded but hasn't been applied yet [docker/for-win#12188](https://github.com/docker/for-win/issues/12188).
+- Fixed installing a new update killing the application before it has time to shut down.
+- Fixed: Installation of Docker Desktop now works even with group policies preventing users to start prerequisite services (e.g. LanmanServer) [docker/for-win#12291](https://github.com/docker/for-win/issues/12291).
+
+
 ## Docker Desktop 4.1.1
 2021-10-12
 
 > 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/69879/Docker%20Desktop%20Installer.exe)
 
 ### Bug fixes and minor changes
 

go/mac-desktop-pause.md

@@ -0,0 +1,6 @@
+---
+title: Pause and Resume Docker Desktop
+description: Instructions on how to pause and resume Docker Desktop
+keywords: pause, resume, docker desktop, mac
+redirect_to: /desktop/mac/#pauseresume
+---

go/win-desktop-pause.md

@@ -0,0 +1,6 @@
+---
+title: Pause and Resume Docker Desktop
+description: Instructions on how to pause and resume Docker Desktop
+keywords: pause, resume, docker desktop, windows
+redirect_to: /desktop/windows/#pauseresume
+---