Merge pull request #18529 from docker/published-update

publish updates from main

content/desktop/hardened-desktop/settings-management/_index.md

@@ -39,6 +39,7 @@ Using the `admin-settings.json` file, admins can:
 - Configure Docker Engine
 - Turn off Docker Desktop's ability to checks for updates
 - Turn off Docker Extensions
+- Turn off Docker Scout SBOM indexing
 
 For more details on the syntax and options admins can set, see [Configure Settings Management](configure.md).
 
@@ -58,4 +59,4 @@ Docker doesn't automatically mandate that developers re-launch and re-authentica
 
 Any settings that are enforced, are grayed out in Docker Desktop and the user is unable to edit them, either via the Docker Desktop UI, CLI, or the `settings.json` file. In addition, if Enhanced Container Isolation is enforced, users can't use privileged containers or similar techniques to modify enforced settings within the Docker Desktop Linux VM, for example, reconfigure proxy and networking of reconfigure Docker Engine.
 
-![Proxy settings grayed out](/assets/images/grayed-setting.png)
+![Proxy settings grayed out](/assets/images/grayed-setting.png)

content/desktop/hardened-desktop/settings-management/configure.md

@@ -108,6 +108,11 @@ The following `admin-settings.json` code and table provides an example of the re
   "extensionsEnabled": {
     "value": false,
     "locked": true
+  },
+  "scout": {
+    "locked": false,
+    "sbomIndexing": true,
+    "useBackgroundIndexing": true
   }
 }
 ```
@@ -129,6 +134,7 @@ The following `admin-settings.json` code and table provides an example of the re
 |`disableUpdate`|  |If `value` is set to true, checking for and notifications about Docker Desktop updates is disabled.|
 |`analyticsEnabled`|  |If `value` is set to false, Docker Desktop doesn't send usage statistics to Docker. |
 |`extensionsEnabled`|  |If `value` is set to false, Docker extensions are disabled. |
+|`scout`|| Setting `useBackgroundIndexing` to `false` disables automatic indexing of images loaded to the image store. Setting `sbomIndexing` to `false` prevents the manual indexing triggered by inspecting an image in Docker Desktop.<br><br>**Note**: Users can still use the `docker scout` CLI commands to index images, even if indexing is disabled in Settings Management. |
 
 ### Step three: Re-launch Docker Desktop
 >**Note**
@@ -148,4 +154,4 @@ Docker doesn't automatically mandate that developers re-launch and sign in once
 
 In Docker Desktop, developers see the relevant settings grayed out and the message **Locked by your administrator**.
 
-![Proxy settings grayed out with Settings Management](/assets/images/grayed-setting.png)
+![Proxy settings grayed out with Settings Management](/assets/images/grayed-setting.png)

content/desktop/install/archlinux.md

@@ -8,9 +8,9 @@ aliases:
 - /desktop/linux/install/archlinux/
 ---
 
-This topic discusses installation of Docker Desktop from an [Arch package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-x86_64.pkg.tar.zst) that Docker provides in addition to the supported platforms. Docker has not tested or verified the installation.
+This topic discusses installation of Docker Desktop from an [Arch package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-x86_64.pkg.tar.zst) that Docker provides in addition to the supported platforms. Docker has not tested or verified the installation.
 
-{{< button text="Arch package (experimental)" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-x86_64.pkg.tar.zst?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
+{{< button text="Arch package (experimental)" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-x86_64.pkg.tar.zst?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
 
 _For checksums, see [Release notes](../release-notes.md)_
 

content/desktop/install/debian.md

@@ -10,7 +10,7 @@ aliases:
 
 This page contains information on how to install, launch, and upgrade Docker Desktop on a Debian distribution.
 
-{{< button text="DEB package" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
+{{< button text="DEB package" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
 
 _For checksums, see [Release notes](../release-notes.md)_
 
@@ -53,7 +53,7 @@ Recommended approach to install Docker Desktop on Debian:
 1. Set up Docker's `apt` repository.
    See [Install using the `apt` repository, step 1](../../engine/install/debian.md#install-using-the-repository).
 
-2. Download latest [DEB package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64).
+2. Download latest [DEB package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64).
 
 3. Install the package with apt as follows:
 

content/desktop/install/fedora.md

@@ -10,7 +10,7 @@ aliases:
 
 This page contains information on how to install, launch and upgrade Docker Desktop on a Fedora distribution.
 
-{{< button text="RPM package" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-x86_64.rpm?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
+{{< button text="RPM package" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-x86_64.rpm?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
 
 ## Prerequisites
 
@@ -33,7 +33,7 @@ To install Docker Desktop on Fedora:
 
 1. Set up [Docker's package repository](../../engine/install/fedora.md#set-up-the-repository).
 
-2. Download latest [RPM package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-x86_64.rpm?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64).
+2. Download latest [RPM package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-x86_64.rpm?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64).
 
 3. Install the package with dnf as follows:
 

content/desktop/install/ubuntu.md

@@ -13,7 +13,7 @@ aliases:
 
 This page contains information on how to install, launch and upgrade Docker Desktop on an Ubuntu distribution.
 
-{{< button text="DEB package" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
+{{< button text="DEB package" url="https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64" >}}
 
 _For checksums, see [Release notes](../release-notes.md)_
 
@@ -53,7 +53,7 @@ Recommended approach to install Docker Desktop on Ubuntu:
 1. Set up Docker's package repository.
    See [Install using the `apt` repository, step 1](../../engine/install/ubuntu.md#install-using-the-repository).
 
-2. Download latest [DEB package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.24.2-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64).
+2. Download latest [DEB package](https://desktop.docker.com/linux/main/amd64/docker-desktop-4.25.0-amd64.deb?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-linux-amd64).
 
 3. Install the package with apt as follows:
 

content/desktop/release-notes.md

@@ -24,11 +24,77 @@ Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/pro
 
 For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/releases.md).
 
+## 4.25.0
+
+{{< release-date date="2023-10-26" >}}
+
+{{< desktop-install all=true version="4.25.0" build_path="/" >}}
+
+### 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.
+- 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 requires a Windows version of 19044 or later.
+- Administrators now have the ability to control Docker Scout image analysis  in [Settings Management](hardened-desktop/settings-management/configure.md).
+
+### Upgrades
+
+- [Compose v2.23.0](https://github.com/docker/compose/releases/tag/v2.23.0)
+- [Docker Scout CLI v1.0.9](https://github.com/docker/scout-cli/releases/tag/v1.0.9).
+- [Kubernetes v1.28.2](https://github.com/kubernetes/kubernetes/releases/tag/v1.28.2)
+  - [cri-dockerd v0.3.4](https://github.com/Mirantis/cri-dockerd/releases/tag/v0.3.4)
+  - [CNI plugins v1.3.0](https://github.com/containernetworking/plugins/releases/tag/v1.3.0)
+  - [cri-tools v1.28.0](https://github.com/kubernetes-sigs/cri-tools/releases/tag/v1.28.0)
+
+### Bug fixes and enhancements
+
+#### For all platforms
+
+- Fixed a spacing problem in the `Accept License` pop-up.
+- Fixed a bug where the **Notifications drawer** changed size when navigating between **Notifications list** and **Notification details** view.
+- containerd integration:
+  - `docker push` now supports `Layer already exists` and `Mounted from` progress statuses.
+  - `docker save` is now able to export images from all tags of the repository.
+  - Hide push upload progress of manifests, configs and indexes (small json blobs) to match the original push behavior.
+  - Fixed `docker diff` containing extra differences.
+  - Fixed `docker history` not showing intermediate image IDs for images built with the classic builder.
+  - Fixed `docker load` not being able to load images from compressed tar archives.
+  - Fixed registry mirrors not working.
+  - Fixed `docker diff` not working correctly when called multiple times concurrently for the same container.
+  - Fixed `docker push` not reusing layers when pushing layers to different repositories on the same registry.
+- Docker Init:
+  - Fixed outdated links to Docker documentation included in generated files
+  - Add support for ASP.NET Core 8 (in addition to 6 and 7)
+- Fixed a bug that caused a failure when installing Wasm shims.
+- Fixed a bug where Docker Desktop exits the [Resource Saver mode](https://docs.docker.com/desktop/use-desktop/resource-saver/) every 15 minutes, or, if the timer is set above 15 minutes, the resource saver mode never kicks in.
+- Promoted the **Enable background SBOM indexing** option to **General settings**.
+
+#### For Mac
+
+- Enhanced error messaging when an update cannot be completed if the user doesn't match the owner of `Docker.app`. Fixes [docker/for-mac#7000](https://github.com/docker/for-mac/issues/7000).
+- Fixed a bug where **Re-apply configuration** might not work when `/var/run/docker.sock` is mis-configured.
+- Docker Desktop doesn't overwrite `ECRCredentialHelper` if already present in `/usr/local/bin`.
+
+
+#### For Windows
+
+- Fixed an issue where **Switch to Windows Containers** would show in the tray menu on Windows Home Editions. Fixes [docker/for-win#13715](https://github.com/docker/for-win/issues/13715)
+
+#### For Linux
+
+- Fixed a bug in `docker login`. Fixes  [docker/docker-credential-helpers#299](https://github.com/docker/docker-credential-helpers/issues/299)
+
+### Known Issues
+
+#### For Mac
+
+- Upgrading to MacOS 14 can cause Docker Desktop to also update to a latest version even if the auto update option is disabled.
+
 ## 4.24.2
 
 {{< release-date date="2023-10-12" >}}
 
-{{< desktop-install all=true version="4.24.2" build_path="/124339/" >}}
+{{< desktop-install all=true version="4.25.0" build_path="/124339/" >}}
 
 ### Bug fixes and enhancements
 

content/desktop/settings/linux.md

@@ -44,6 +44,10 @@ If you choose the integrated terminal, you can run commands in a running contain
 
 - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively.
 
+- **SBOM Indexing**. When this option is enabled, inspecting an image in Docker Desktop shows a **Start analysis** button that, when selected, analyzes the image with Docker Scout.
+
+- **Enable background SBOM indexing**. When this option is enabled, Docker Scout automatically analyzes images that you build or pull.
+
 ## Resources
 
 The **Resources** tab allows you to configure CPU, memory, disk, proxies,

content/desktop/settings/mac.md

@@ -64,6 +64,10 @@ If you choose the integrated terminal, you can run commands in a running contain
 
 - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively.
 
+- **SBOM Indexing**. When this option is enabled, inspecting an image in Docker Desktop shows a **Start analysis** button that, when selected, analyzes the image with Docker Scout.
+
+- **Enable background SBOM indexing**. When this option is enabled, Docker Scout automatically analyzes images that you build or pull.
+
 ## Resources
 
 The **Resources** tab allows you to configure CPU, memory, disk, proxies,

content/desktop/settings/windows.md

@@ -53,6 +53,10 @@ On the **General** tab, you can configure when to start Docker and specify other
 
 - **Show CLI hints**. Displays CLI hints and tips when running Docker commands in the CLI. This is turned on by default. To turn CLI hints on or off from the CLI, set `DOCKER_CLI_HINTS` to `true` or `false` respectively.
 
+- **SBOM Indexing**. When this option is enabled, inspecting an image in Docker Desktop shows a **Start analysis** button that, when selected, analyzes the image with Docker Scout.
+
+- **Enable background SBOM indexing**. When this option is enabled, Docker Scout automatically analyzes images that you build or pull.
+
 ## Resources
 
 The **Resources** tab allows you to configure CPU, memory, disk, proxies,