From 6057a7b51f5aebef7fccad80b98cc65234a2dd9f Mon Sep 17 00:00:00 2001 From: Nicolas De loof Date: Thu, 10 Apr 2025 10:30:57 +0200 Subject: [PATCH 1/3] fix use of x-* attribute in go templates (#22403) ## Description fix https://docs.docker.com/compose/bridge/customize/#add-your-own-templates as attributes with a `-` can't be accessed directly using dot-notation in a go template. See https://stackoverflow.com/questions/48146448/range-through-values-within-variable-containing-dashes-in-golang-templates ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review Signed-off-by: Nicolas De Loof --- content/manuals/compose/bridge/customize.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/compose/bridge/customize.md b/content/manuals/compose/bridge/customize.md index 62bdcb880ddb..d978ecf6b9fa 100644 --- a/content/manuals/compose/bridge/customize.md +++ b/content/manuals/compose/bridge/customize.md @@ -133,8 +133,8 @@ metadata: spec: rules: {{ range $name, $service := .services }} -{{ if $service.x-virtual-host }} - - host: ${{ $service.x-virtual-host }} +{{ range index $service "x-virtual-host" }} + - host: ${{ . }} http: paths: - path: "/" From 09fabd2fa0f57277130f13146541598529501962 Mon Sep 17 00:00:00 2001 From: Lorenz Vanthillo Date: Thu, 10 Apr 2025 10:55:47 +0200 Subject: [PATCH 2/3] BuildKit supports multiple cache exporters Related to https://github.com/docker/docs/issues/18590 --- content/manuals/build/cache/backends/_index.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/content/manuals/build/cache/backends/_index.md b/content/manuals/build/cache/backends/_index.md index 6dd4a8a9dee9..de54ea0f6cec 100644 --- a/content/manuals/build/cache/backends/_index.md +++ b/content/manuals/build/cache/backends/_index.md @@ -81,12 +81,11 @@ $ docker buildx build --push -t / \ ## Multiple caches -BuildKit currently only supports -[a single cache exporter](https://github.com/moby/buildkit/pull/3024). But you -can import from as many remote caches as you like. For example, a common pattern -is to use the cache of both the current branch and the main branch. The -following example shows importing cache from multiple locations using the -registry cache backend: +BuildKit supports multiple cache exporters, allowing you to push cache to more +than one destination. You can also import from as many remote caches as you'd +like. For example, a common pattern is to use the cache of both the current +branch and the main branch. The following example shows importing cache from +multiple locations using the registry cache backend: ```console $ docker buildx build --push -t / \ From 258e17544bc1ff8c5cab4fd872bf3f88214be80c Mon Sep 17 00:00:00 2001 From: Lorena Rangel Date: Thu, 10 Apr 2025 11:22:56 +0200 Subject: [PATCH 3/3] Update update release notes (#22407) ## Description Updates the line about the removal of `com.docker.admin`, as it is still present (and used) on Windows. ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 144b0ecc6f34..275183a50ed0 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -57,7 +57,7 @@ For more frequently asked questions, see the [FAQs](/manuals/desktop/troubleshoo - Fixed a race condition that prevented Docker Desktop Kubernetes from starting in some scenarios. - Improved the way ECI collects image digest info from a repository in environments where proxies are configured. - Users can now to specify a timeout when generating a private Extension Marketplace using the new `--timeout` flag. -- Removed unused internal helper tool `com.docker.admin`. +- Removed unused internal helper tool `com.docker.admin` for Mac and Linux. #### For Mac