From 930dee78b0533992654df8ff473586e9a2977eb4 Mon Sep 17 00:00:00 2001 From: Kaze <89641145+shiinakaze@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:45:52 +0800 Subject: [PATCH 1/5] Update windows-install.md (#22184) The UEFI field was added ## Description There is a difference between BIOS and UEFI, so the UEFI field is added ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/setup/install/windows-install.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/manuals/desktop/setup/install/windows-install.md b/content/manuals/desktop/setup/install/windows-install.md index 2e416eecbfc0..91e432258231 100644 --- a/content/manuals/desktop/setup/install/windows-install.md +++ b/content/manuals/desktop/setup/install/windows-install.md @@ -55,7 +55,7 @@ _For checksums, see [Release notes](/manuals/desktop/release-notes.md)_ WSL 2 on Windows 10 or Windows 11: - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation) - 4GB system RAM - - Enable hardware virtualization in BIOS. For more information, see + - Enable hardware virtualization in BIOS/UEFI. For more information, see [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals/desktop/features/wsl/_index.md). @@ -80,8 +80,8 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals - 64 bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation) - 4GB system RAM - - Turn on BIOS-level hardware virtualization support in the - BIOS settings. For more information, see + - Turn on BIOS/UEFI-level hardware virtualization support in the + BIOS/UEFI settings. For more information, see [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). > [!NOTE] @@ -105,7 +105,7 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals WSL 2 on Windows 10 or Windows 11: - 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation) - 4GB system RAM - - Enable hardware virtualization in BIOS. For more information, see + - Enable hardware virtualization in BIOS/UEFI. For more information, see [Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization). > [!IMPORTANT] From e396af23581133dc5bed4947748b00828c550ca4 Mon Sep 17 00:00:00 2001 From: Nicolas De loof Date: Mon, 10 Mar 2025 11:00:09 +0100 Subject: [PATCH 2/5] some clarification on additional_contexts (#22204) ## Description some clarification as requested on https://github.com/docker/compose/issues/8538#issuecomment-2707487495 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Signed-off-by: Nicolas De Loof Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- .../compose/how-tos/dependent-images.md | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/content/manuals/compose/how-tos/dependent-images.md b/content/manuals/compose/how-tos/dependent-images.md index a8a462539c9b..238f27efb40a 100644 --- a/content/manuals/compose/how-tos/dependent-images.md +++ b/content/manuals/compose/how-tos/dependent-images.md @@ -99,11 +99,38 @@ services: b: image: service_b build: - context: b/ dockerfile: b.Dockerfile additional_contexts: - # `FROM service_a` will be resolved as a dependency on service a which has to be built first - service_a: "service:a" + # `FROM service_a` will be resolved as a dependency on service "a" which has to be built first + service_a: "service:a" +``` + +With the `additional_contexts` attribute, you can refer to an image built by another service without needing to explicitly name it: + +b.Dockerfile: + +```dockerfile + +FROM base_image +# `base_image` doesn't resolve to an actual image. This is used to point to a named additional context + +# build service b +``` + +Compose file: + +```yaml +services: + a: + build: + dockerfile: a.Dockerfile + # built image will be tagged _a + b: + build: + dockerfile: b.Dockerfile + additional_contexts: + # `FROM base_image` will be resolved as a dependency on service "a" which has to be built first + base_image: "service:a" ``` ## Build with Bake From 75edebe6958522e093c0960ab8cb6b7aa25cf2f2 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Mon, 10 Mar 2025 10:43:51 +0000 Subject: [PATCH 3/5] feedback link fix: (#22212) ## Description fixes https://github.com/docker/docs/issues/22196#event-16635660473 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- content/manuals/desktop/troubleshoot-and-support/feedback.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/manuals/desktop/troubleshoot-and-support/feedback.md b/content/manuals/desktop/troubleshoot-and-support/feedback.md index 513ef1e307e4..3394c6de3949 100644 --- a/content/manuals/desktop/troubleshoot-and-support/feedback.md +++ b/content/manuals/desktop/troubleshoot-and-support/feedback.md @@ -4,6 +4,8 @@ keywords: Feedback, Docker Desktop, Linux, Mac, Windows, Dev Environments, Exten Community forum, bugs, problems, issues title: Give feedback weight: 40 +aliases: + - /desktop/feedback/ --- There are many ways you can provide feedback on Docker Desktop or Docker Desktop features. From 8f841a38be09ca654a206d335140dd0628debc01 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Mon, 10 Mar 2025 15:23:09 +0200 Subject: [PATCH 4/5] Update build-summary.md Updated docker-build-push-action occurrancies to build-push-action. --- content/manuals/build/ci/github-actions/build-summary.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/build/ci/github-actions/build-summary.md b/content/manuals/build/ci/github-actions/build-summary.md index a2e74b5093c3..9472ead8e685 100644 --- a/content/manuals/build/ci/github-actions/build-summary.md +++ b/content/manuals/build/ci/github-actions/build-summary.md @@ -67,7 +67,7 @@ in the YAML configuration for your build step: ```yaml {hl_lines=4} - name: Build - uses: docker/docker-build-push-action@v6 + uses: docker/build-push-action@v6 env: DOCKER_BUILD_SUMMARY: false with: @@ -83,7 +83,7 @@ your build step: ```yaml {hl_lines=4} - name: Build - uses: docker/docker-build-push-action@v6 + uses: docker/build-push-action@v6 env: DOCKER_BUILD_RECORD_UPLOAD: false with: From 93f7b2486329dc29754a475bc67b574adc1a8aee Mon Sep 17 00:00:00 2001 From: Lorena Rangel Date: Mon, 10 Mar 2025 17:26:40 +0100 Subject: [PATCH 5/5] Add missing release note to Docker Desktop release notes (#22218) ## Description ## Related issues or tickets missing release note ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- content/manuals/desktop/release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/manuals/desktop/release-notes.md b/content/manuals/desktop/release-notes.md index 2e0a851590c0..54c47acc4749 100644 --- a/content/manuals/desktop/release-notes.md +++ b/content/manuals/desktop/release-notes.md @@ -61,6 +61,7 @@ For more frequently asked questions, see the [FAQs](/manuals/desktop/troubleshoo - Fixed an issue that caused clients other than the CLI and Docker Desktop to see a delay of 3 seconds whenever a container with port-mappings exists. See [docker/for-mac#7575](https://github.com/docker/for-mac/issues/7575) - Fixed a bug in the ECI Docker socket permissions which caused it to sometimes block Docker socket mounts on containers with allowed images, or images derived from allowed images. - Fixed a bug that prevented Docker Desktop from entering Resource Saver mode again immediately after an engine restart. +- Fixed an issue that caused Kubernetes clusters to stop working due to expired PKI certificates. #### For Mac