Skip to content

Commit 781cff5

Browse files
crazy-maxgithub-actions[bot]
authored andcommitted
vendor: github.com/docker/buildx v0.13.0
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 4a20784 commit 781cff5

File tree

10 files changed

+212
-41
lines changed

10 files changed

+212
-41
lines changed

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

Lines changed: 52 additions & 1 deletion
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 v25.0.3-0.20240203133757-341a7978a541+incompatible
2-
# github.com/moby/buildkit v0.13.0-beta3.0.20240201135300-d906167d0b34
3-
# github.com/docker/buildx v0.12.2-0.20240220084849-89154c7d3303
2+
# github.com/moby/buildkit v0.13.0
3+
# github.com/docker/buildx v0.13.0
44
# github.com/docker/scout-cli v1.4.1
5-
# github.com/docker/cli v25.0.4-0.20240221083216-f67e569a8fb9+incompatible
5+
# github.com/docker/cli v26.0.0-rc1+incompatible
66
# github.com/docker/compose/v2 v2.24.6

data/buildx/docker_buildx.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cname:
88
- docker buildx build
99
- docker buildx create
1010
- docker buildx debug
11+
- docker buildx dial-stdio
1112
- docker buildx du
1213
- docker buildx imagetools
1314
- docker buildx inspect
@@ -22,6 +23,7 @@ clink:
2223
- docker_buildx_build.yaml
2324
- docker_buildx_create.yaml
2425
- docker_buildx_debug.yaml
26+
- docker_buildx_dial-stdio.yaml
2527
- docker_buildx_du.yaml
2628
- docker_buildx_imagetools.yaml
2729
- docker_buildx_inspect.yaml

data/buildx/docker_buildx_build.yaml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ options:
453453
- option: shm-size
454454
value_type: bytes
455455
default_value: "0"
456-
description: Size of `/dev/shm`
456+
description: Shared memory size for build containers
457457
details_url: '#shm-size'
458458
deprecated: false
459459
hidden: false
@@ -613,7 +613,7 @@ examples: |-
613613
- `security.insecure` - Allows executions without sandbox. See
614614
[related Dockerfile extensions](/reference/dockerfile/#run---securitysandbox).
615615
616-
For entitlements to be enabled, the `buildkitd` daemon also needs to allow them
616+
For entitlements to be enabled, the BuildKit daemon also needs to allow them
617617
with `--allow-insecure-entitlement` (see [`create --buildkitd-flags`](/reference/cli/docker/buildx/create/#buildkitd-flags)).
618618
619619
```console
@@ -786,6 +786,7 @@ examples: |-
786786
787787
```json
788788
{
789+
"buildx.build.ref": "mybuilder/mybuilder0/0fjb6ubs52xx3vygf6fgdl611",
789790
"containerimage.config.digest": "sha256:2937f66a9722f7f4a2df583de2f8cb97fc9196059a410e7f00072fc918930e66",
790791
"containerimage.descriptor": {
791792
"annotations": {
@@ -882,6 +883,10 @@ examples: |-
882883
$ docker buildx build -t tonistiigi/foo -o type=registry
883884
```
884885
886+
> **Note **
887+
>
888+
> Since BuildKit v0.13.0 multiple outputs can be specified by repeating the flag.
889+
885890
Supported exported types are:
886891
887892
#### `local`
@@ -1112,12 +1117,21 @@ examples: |-
11121117
$ SECRET_TOKEN=token docker buildx build --secret id=SECRET_TOKEN .
11131118
```
11141119
1115-
### Size of /dev/shm (--shm-size) {#shm-size}
1120+
### Shared memory size for build containers (--shm-size) {#shm-size}
1121+
1122+
Sets the size of the shared memory allocated for build containers when using
1123+
`RUN` instructions.
11161124
11171125
The format is `<number><unit>`. `number` must be greater than `0`. Unit is
11181126
optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g`
11191127
(gigabytes). If you omit the unit, the system uses bytes.
11201128
1129+
> **Note**
1130+
>
1131+
> In most cases, it is recommended to let the builder automatically determine
1132+
> the appropriate configurations. Manual adjustments should only be considered
1133+
> when specific performance tuning is required for complex build scenarios.
1134+
11211135
### SSH agent socket or keys to expose to the build (--ssh) {#ssh}
11221136
11231137
```text
@@ -1151,7 +1165,8 @@ examples: |-
11511165
11521166
### Set ulimits (--ulimit) {#ulimit}
11531167
1154-
`--ulimit` is specified with a soft and hard limit as such:
1168+
`--ulimit` overrides the default ulimits of build's containers when using `RUN`
1169+
instructions and are specified with a soft and hard limit as such:
11551170
`<type>=<soft limit>[:<hard limit>]`, for example:
11561171
11571172
```console
@@ -1163,6 +1178,12 @@ examples: |-
11631178
> If you don't provide a `hard limit`, the `soft limit` is used
11641179
> for both values. If no `ulimits` are set, they're inherited from
11651180
> the default `ulimits` set on the daemon.
1181+
1182+
> **Note**
1183+
>
1184+
> In most cases, it is recommended to let the builder automatically determine
1185+
> the appropriate configurations. Manual adjustments should only be considered
1186+
> when specific performance tuning is required for complex build scenarios.
11661187
deprecated: false
11671188
hidden: false
11681189
experimental: false

data/buildx/docker_buildx_create.yaml

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,19 @@ options:
4343
experimentalcli: false
4444
kubernetes: false
4545
swarm: false
46+
- option: buildkitd-config
47+
value_type: string
48+
description: BuildKit daemon config file
49+
details_url: '#buildkitd-config'
50+
deprecated: false
51+
hidden: false
52+
experimental: false
53+
experimentalcli: false
54+
kubernetes: false
55+
swarm: false
4656
- option: buildkitd-flags
4757
value_type: string
48-
description: Flags for buildkitd daemon
58+
description: BuildKit daemon flags
4959
details_url: '#buildkitd-flags'
5060
deprecated: false
5161
hidden: false
@@ -55,10 +65,9 @@ options:
5565
swarm: false
5666
- option: config
5767
value_type: string
58-
description: BuildKit config file
59-
details_url: '#config'
68+
description: BuildKit daemon config file
6069
deprecated: false
61-
hidden: false
70+
hidden: true
6271
experimental: false
6372
experimentalcli: false
6473
kubernetes: false
@@ -153,29 +162,15 @@ examples: |-
153162
eager_beaver
154163
```
155164
156-
### Specify options for the buildkitd daemon (--buildkitd-flags) {#buildkitd-flags}
165+
### Specify a configuration file for the BuildKit daemon (--buildkitd-config) {#buildkitd-config}
157166
158167
```text
159-
--buildkitd-flags FLAGS
168+
--buildkitd-config FILE
160169
```
161170
162-
Adds flags when starting the buildkitd daemon. They take precedence over the
163-
configuration file specified by [`--config`](#config). See `buildkitd --help`
164-
for the available flags.
165-
166-
```text
167-
--buildkitd-flags '--debug --debugaddr 0.0.0.0:6666'
168-
```
169-
170-
### Specify a configuration file for the buildkitd daemon (--config) {#config}
171-
172-
```text
173-
--config FILE
174-
```
175-
176-
Specifies the configuration file for the buildkitd daemon to use. The configuration
177-
can be overridden by [`--buildkitd-flags`](#buildkitd-flags).
178-
See an [example buildkitd configuration file](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md).
171+
Specifies the configuration file for the BuildKit daemon to use. The
172+
configuration can be overridden by [`--buildkitd-flags`](#buildkitd-flags).
173+
See an [example BuildKit daemon configuration file](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md).
179174
180175
If you don't specify a configuration file, Buildx looks for one by default in:
181176
@@ -188,6 +183,36 @@ examples: |-
188183
will be copied into the container under `/etc/buildkit/certs` and configuration
189184
will be updated to reflect that.
190185
186+
### Specify options for the BuildKit daemon (--buildkitd-flags) {#buildkitd-flags}
187+
188+
```text
189+
--buildkitd-flags FLAGS
190+
```
191+
192+
Adds flags when starting the BuildKit daemon. They take precedence over the
193+
configuration file specified by [`--buildkitd-config`](#buildkitd-config). See
194+
`buildkitd --help` for the available flags.
195+
196+
```text
197+
--buildkitd-flags '--debug --debugaddr 0.0.0.0:6666'
198+
```
199+
200+
#### BuildKit daemon network mode
201+
202+
You can specify the network mode for the BuildKit daemon with either the
203+
configuration file specified by [`--buildkitd-config`](#buildkitd-config) using the
204+
`worker.oci.networkMode` option or `--oci-worker-net` flag here. The default
205+
value is `auto` and can be one of `bridge`, `cni`, `host`:
206+
207+
```text
208+
--buildkitd-flags '--oci-worker-net bridge'
209+
```
210+
211+
> **Note**
212+
>
213+
> Network mode "bridge" is supported since BuildKit v0.13 and will become the
214+
> default in next v0.14.
215+
191216
### Set the builder driver to use (--driver) {#driver}
192217
193218
```text
@@ -231,8 +256,8 @@ examples: |-
231256
232257
#### `remote` driver
233258
234-
Uses a remote instance of buildkitd over an arbitrary connection. With this
235-
driver, you manually create and manage instances of buildkit yourself, and
259+
Uses a remote instance of BuildKit daemon over an arbitrary connection. With
260+
this driver, you manually create and manage instances of buildkit yourself, and
236261
configure buildx to point at it.
237262
238263
Unlike `docker` driver, built images will not automatically appear in

data/buildx/docker_buildx_debug_build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ options:
430430
- option: shm-size
431431
value_type: bytes
432432
default_value: "0"
433-
description: Size of `/dev/shm`
433+
description: Shared memory size for build containers
434434
deprecated: false
435435
hidden: false
436436
experimental: false
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
command: docker buildx dial-stdio
2+
short: Proxy current stdio streams to builder instance
3+
long: |-
4+
dial-stdio uses the stdin and stdout streams of the command to proxy to the configured builder instance.
5+
It is not intended to be used by humans, but rather by other tools that want to interact with the builder instance via BuildKit API.
6+
usage: docker buildx dial-stdio
7+
pname: docker buildx
8+
plink: docker_buildx.yaml
9+
options:
10+
- option: platform
11+
value_type: string
12+
description: 'Target platform: this is used for node selection'
13+
deprecated: false
14+
hidden: false
15+
experimental: false
16+
experimentalcli: false
17+
kubernetes: false
18+
swarm: false
19+
- option: progress
20+
value_type: string
21+
default_value: quiet
22+
description: Set type of progress output (auto, plain, tty).
23+
deprecated: false
24+
hidden: false
25+
experimental: false
26+
experimentalcli: false
27+
kubernetes: false
28+
swarm: false
29+
inherited_options:
30+
- option: builder
31+
value_type: string
32+
description: Override the configured builder instance
33+
deprecated: false
34+
hidden: false
35+
experimental: false
36+
experimentalcli: false
37+
kubernetes: false
38+
swarm: false
39+
examples: |-
40+
Example go program that uses the dial-stdio command wire up a buildkit client.
41+
This is for example use only and may not be suitable for production use.
42+
43+
```go
44+
client.New(ctx, "", client.WithContextDialer(func(context.Context, string) (net.Conn, error) {
45+
c1, c2 := net.Pipe()
46+
cmd := exec.Command("docker", "buildx", "dial-stdio")
47+
cmd.Stdin = c1
48+
cmd.Stdout = c1
49+
50+
if err := cmd.Start(); err != nil {
51+
c1.Close()
52+
c2.Close()
53+
return nil, err
54+
}
55+
56+
go func() {
57+
cmd.Wait()
58+
c2.Close()
59+
}()
60+
61+
return c2
62+
}))
63+
```
64+
deprecated: false
65+
hidden: false
66+
experimental: false
67+
experimentalcli: false
68+
kubernetes: false
69+
swarm: false
70+

0 commit comments

Comments
 (0)