Skip to content

Commit e54d76d

Browse files
sarahsanders-dockersarahsanders-docker
authored
Merge branch 'main' into summary-bar
2 parents c7ddeca + 2c8d8f2 commit e54d76d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+765
-136
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ARG ALPINE_VERSION=3.21
55
ARG GO_VERSION=1.23
66
ARG HTMLTEST_VERSION=0.17.0
7-
ARG HUGO_VERSION=0.139.0
7+
ARG HUGO_VERSION=0.141.0
88
ARG NODE_VERSION=22
99
ARG PAGEFIND_VERSION=1.3.0
1010

‎_vale/config/vocabularies/Docker/accept.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ Zsh
154154
[Vv]irtiofs
155155
[Vv]irtualize
156156
[Ww]alkthrough
157+
bootup
157158
cgroup
158159
config
159160
containerd

‎_vendor/github.com/docker/buildx/docs/bake-reference.md‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md‎

Lines changed: 15 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_vendor/modules.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v27.5.0+incompatible
2-
# github.com/moby/buildkit v0.18.1
3-
# github.com/docker/buildx v0.19.2
2+
# github.com/moby/buildkit v0.19.0
3+
# github.com/docker/buildx v0.20.0
44
# github.com/docker/cli v27.5.0+incompatible
5-
# github.com/docker/compose/v2 v2.32.3
5+
# github.com/docker/compose/v2 v2.32.4
66
# github.com/docker/scout-cli v1.15.0

‎content/get-started/docker-concepts/running-containers/sharing-local-files.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Using a bind mount, you can map the configuration file on your host computer to
101101
$ mkdir public_html
102102
```
103103

104-
3. Change the directory to `public_html` and create a file called `index.html` with the following content. This is a basic HTML document that creates a simple webpage that welcomes you with a friendly whale.
104+
3. Navigate into the newly created directory `public_html` and create a file called `index.html` with the following content. This is a basic HTML document that creates a simple webpage that welcomes you with a friendly whale.
105105

106106
```html
107107
<!DOCTYPE html>

‎content/get-started/workshop/06_bind_mounts.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ work.
5252
Docker Desktop's file sharing setting. This setting defines which parts of your
5353
filesystem you can share with containers. For details about accessing the setting, see [File sharing](/manuals/desktop/settings-and-maintenance/settings.md#file-sharing).
5454

55+
> [!NOTE]
56+
> The **File sharing** tab is only available in Hyper-V mode, because the files are automatically shared in WSL 2 mode and Windows container mode.
57+
5558
2. Open a terminal and change directory to the `getting-started-app`
5659
directory.
5760

‎content/manuals/build/bake/_index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ A Bake file can be written in HCL, JSON, or YAML formats, where the YAML format
1616
is an extension of a Docker Compose file. Here's an example Bake file in HCL
1717
format:
1818

19-
```hcl
19+
```hcl {title=docker-bake.hcl}
2020
group "default" {
2121
targets = ["frontend", "backend"]
2222
}

‎content/manuals/build/bake/contexts.md‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ Supported context values are:
2929

3030
## Pinning alpine image
3131

32-
```dockerfile
32+
```dockerfile {title=Dockerfile}
3333
# syntax=docker/dockerfile:1
3434
FROM alpine
3535
RUN echo "Hello world"
3636
```
3737

38-
```hcl
39-
# docker-bake.hcl
38+
```hcl {title=docker-bake.hcl}
4039
target "app" {
4140
contexts = {
4241
alpine = "docker-image://alpine:3.13"
@@ -46,16 +45,14 @@ target "app" {
4645

4746
## Using a secondary source directory
4847

49-
```dockerfile
50-
# syntax=docker/dockerfile:1
51-
FROM scratch AS src
52-
48+
```dockerfile {title=Dockerfile}
5349
FROM golang
5450
COPY --from=src . .
5551
```
5652

57-
```hcl
58-
# docker-bake.hcl
53+
```hcl {title=docker-bake.hcl}
54+
# Running `docker buildx bake app` will result in `src` not pointing
55+
# to some previous build stage but to the client filesystem, not part of the context.
5956
target "app" {
6057
contexts = {
6158
src = "../path/to/source"
@@ -68,14 +65,16 @@ target "app" {
6865
To use a result of one target as a build context of another, specify the target
6966
name with `target:` prefix.
7067

71-
```dockerfile
68+
```dockerfile {title=baseapp.Dockerfile}
69+
FROM scratch
70+
```
71+
```dockerfile {title=Dockerfile}
7272
# syntax=docker/dockerfile:1
7373
FROM baseapp
7474
RUN echo "Hello world"
7575
```
7676

77-
```hcl
78-
# docker-bake.hcl
77+
```hcl {title=docker-bake.hcl}
7978
target "base" {
8079
dockerfile = "baseapp.Dockerfile"
8180
}
@@ -119,7 +118,7 @@ result in significant impact on build time, depending on your build
119118
configuration. For example, say you have a Bake file that defines the following
120119
group of targets:
121120

122-
```hcl
121+
```hcl {title=docker-bake.hcl}
123122
group "default" {
124123
targets = ["target1", "target2"]
125124
}
@@ -148,7 +147,7 @@ context that only loads the context files, and have each target that needs
148147
those files reference that named context. For example, the following Bake file
149148
defines a named target `ctx`, which is used by both `target1` and `target2`:
150149

151-
```hcl
150+
```hcl {title=docker-bake.hcl}
152151
group "default" {
153152
targets = ["target1", "target2"]
154153
}
@@ -177,7 +176,7 @@ The named context `ctx` represents a Dockerfile stage, which copies the files
177176
from its context (`.`). Other stages in the Dockerfile can now reference the
178177
`ctx` named context and, for example, mount its files with `--mount=from=ctx`.
179178

180-
```dockerfile
179+
```dockerfile {title=Dockerfile}
181180
FROM scratch AS ctx
182181
COPY --link . .
183182

‎content/manuals/build/bake/expressions.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Printing the Bake file with the `--print` flag shows the evaluated value for
3030
the `answer` build argument.
3131

3232
```console
33-
$ docker buildx bake --print app
33+
$ docker buildx bake --print
3434
```
3535

3636
```json
@@ -76,13 +76,8 @@ $ docker buildx bake --print
7676

7777
```json
7878
{
79-
"group": {
80-
"default": {
81-
"targets": ["default"]
82-
}
83-
},
8479
"target": {
85-
"webapp": {
80+
"default": {
8681
"context": ".",
8782
"dockerfile": "Dockerfile",
8883
"tags": ["my-image:latest"]

0 commit comments

Comments
 (0)