Skip to content

Commit f423849

Browse files
authored
Merge pull request #22213 from docker/published-update
publish updates from main
2 parents ea4e680 + 93f7b24 commit f423849

File tree

5 files changed

+39
-9
lines changed

5 files changed

+39
-9
lines changed

content/manuals/build/ci/github-actions/build-summary.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ in the YAML configuration for your build step:
6767

6868
```yaml {hl_lines=4}
6969
- name: Build
70-
uses: docker/docker-build-push-action@v6
70+
uses: docker/build-push-action@v6
7171
env:
7272
DOCKER_BUILD_SUMMARY: false
7373
with:
@@ -83,7 +83,7 @@ your build step:
8383

8484
```yaml {hl_lines=4}
8585
- name: Build
86-
uses: docker/docker-build-push-action@v6
86+
uses: docker/build-push-action@v6
8787
env:
8888
DOCKER_BUILD_RECORD_UPLOAD: false
8989
with:

content/manuals/compose/how-tos/dependent-images.md

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,38 @@ services:
9999
b:
100100
image: service_b
101101
build:
102-
context: b/
103102
dockerfile: b.Dockerfile
104103
additional_contexts:
105-
# `FROM service_a` will be resolved as a dependency on service a which has to be built first
106-
service_a: "service:a"
104+
# `FROM service_a` will be resolved as a dependency on service "a" which has to be built first
105+
service_a: "service:a"
106+
```
107+
108+
With the `additional_contexts` attribute, you can refer to an image built by another service without needing to explicitly name it:
109+
110+
b.Dockerfile:
111+
112+
```dockerfile
113+
114+
FROM base_image
115+
# `base_image` doesn't resolve to an actual image. This is used to point to a named additional context
116+
117+
# build service b
118+
```
119+
120+
Compose file:
121+
122+
```yaml
123+
services:
124+
a:
125+
build:
126+
dockerfile: a.Dockerfile
127+
# built image will be tagged <project_name>_a
128+
b:
129+
build:
130+
dockerfile: b.Dockerfile
131+
additional_contexts:
132+
# `FROM base_image` will be resolved as a dependency on service "a" which has to be built first
133+
base_image: "service:a"
107134
```
108135
109136
## Build with Bake

content/manuals/desktop/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ For more frequently asked questions, see the [FAQs](/manuals/desktop/troubleshoo
6161
- 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)
6262
- 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.
6363
- Fixed a bug that prevented Docker Desktop from entering Resource Saver mode again immediately after an engine restart.
64+
- Fixed an issue that caused Kubernetes clusters to stop working due to expired PKI certificates.
6465

6566
#### For Mac
6667

content/manuals/desktop/setup/install/windows-install.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ _For checksums, see [Release notes](/manuals/desktop/release-notes.md)_
5555
WSL 2 on Windows 10 or Windows 11:
5656
- 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation)
5757
- 4GB system RAM
58-
- Enable hardware virtualization in BIOS. For more information, see
58+
- Enable hardware virtualization in BIOS/UEFI. For more information, see
5959
[Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization).
6060

6161
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
8080

8181
- 64 bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation)
8282
- 4GB system RAM
83-
- Turn on BIOS-level hardware virtualization support in the
84-
BIOS settings. For more information, see
83+
- Turn on BIOS/UEFI-level hardware virtualization support in the
84+
BIOS/UEFI settings. For more information, see
8585
[Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization).
8686

8787
> [!NOTE]
@@ -105,7 +105,7 @@ For more information on setting up WSL 2 with Docker Desktop, see [WSL](/manuals
105105
WSL 2 on Windows 10 or Windows 11:
106106
- 64-bit processor with [Second Level Address Translation (SLAT)](https://en.wikipedia.org/wiki/Second_Level_Address_Translation)
107107
- 4GB system RAM
108-
- Enable hardware virtualization in BIOS. For more information, see
108+
- Enable hardware virtualization in BIOS/UEFI. For more information, see
109109
[Virtualization](/manuals/desktop/troubleshoot-and-support/troubleshoot/topics.md#virtualization).
110110

111111
> [!IMPORTANT]

content/manuals/desktop/troubleshoot-and-support/feedback.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ keywords: Feedback, Docker Desktop, Linux, Mac, Windows, Dev Environments, Exten
44
Community forum, bugs, problems, issues
55
title: Give feedback
66
weight: 40
7+
aliases:
8+
- /desktop/feedback/
79
---
810

911
There are many ways you can provide feedback on Docker Desktop or Docker Desktop features.

0 commit comments

Comments
 (0)