Skip to content

Commit 812b82c

Browse files
dvdksndvdksn
committed
vendor: github.com/docker/buildx v0.18.0
Signed-off-by: David Karlsson <[email protected]>
1 parent f2b7502 commit 812b82c

File tree

9 files changed

+115
-18
lines changed

9 files changed

+115
-18
lines changed

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

Lines changed: 1 addition & 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v27.3.1+incompatible
22
# github.com/moby/buildkit v0.17.0
3-
# github.com/docker/buildx v0.17.1
3+
# github.com/docker/buildx v0.18.0
44
# github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible
55
# github.com/docker/compose/v2 v2.30.1
66
# github.com/docker/scout-cli v1.13.0

‎data/buildx/docker_buildx.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
command: docker buildx
22
short: Docker Buildx
33
long: Extended build capabilities with BuildKit
4+
usage: docker buildx
45
pname: docker
56
plink: docker.yaml
67
cname:

‎data/buildx/docker_buildx_build.yaml‎

Lines changed: 67 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@ examples: |-
11151115
```dockerfile
11161116
# syntax=docker/dockerfile:1
11171117
1118-
FROM oven/bun:1 as base
1118+
FROM oven/bun:1 AS base
11191119
WORKDIR /app
11201120
11211121
FROM base AS install
@@ -1401,17 +1401,39 @@ examples: |-
14011401
14021402
Supported types are:
14031403
1404-
- [`file`](#file)
1405-
- [`env`](#env)
1404+
- [`type=file`](#typefile)
1405+
- [`type=env`](#typeenv)
14061406
1407-
Buildx attempts to detect the `type` automatically if unset.
1407+
Buildx attempts to detect the `type` automatically if unset. If an environment
1408+
variable with the same key as `id` is set, then Buildx uses `type=env` and the
1409+
variable value becomes the secret. If no such environment variable is set, and
1410+
`type` is not set, then Buildx falls back to `type=file`.
14081411
1409-
#### `file`
1412+
#### `type=file`
14101413
1411-
Attribute keys:
1414+
Source a build secret from a file.
1415+
1416+
##### `type=file` synopsis
1417+
1418+
```console
1419+
$ docker buildx build --secret [type=file,]id=<ID>[,src=<FILEPATH>] .
1420+
```
1421+
1422+
##### `type=file` attributes
1423+
1424+
| Key | Description | Default |
1425+
| --------------- | ----------------------------------------------------------------------------------------------------- | -------------------------- |
1426+
| `id` | ID of the secret. | N/A (this key is required) |
1427+
| `src`, `source` | Filepath of the file containing the secret value (absolute or relative to current working directory). | `id` if unset. |
1428+
1429+
###### `type=file` usage
14121430
1413-
- `id` - ID of the secret. Defaults to base name of the `src` path.
1414-
- `src`, `source` - Secret filename. `id` used if unset.
1431+
In the following example, `type=file` is automatically detected because no
1432+
environment variable mathing `aws` (the ID) is set.
1433+
1434+
```console
1435+
$ docker buildx build --secret id=aws,src=$HOME/.aws/credentials .
1436+
```
14151437
14161438
```dockerfile
14171439
# syntax=docker/dockerfile:1
@@ -1421,16 +1443,31 @@ examples: |-
14211443
aws s3 cp s3://... ...
14221444
```
14231445
1446+
#### `type=env`
1447+
1448+
Source a build secret from an environment variable.
1449+
1450+
##### `type=env` synopsis
1451+
14241452
```console
1425-
$ docker buildx build --secret id=aws,src=$HOME/.aws/credentials .
1453+
$ docker buildx build --secret [type=env,]id=<ID>[,env=<VARIABLE>] .
14261454
```
14271455
1428-
#### `env`
1456+
##### `type=env` attributes
14291457
1430-
Attribute keys:
1458+
| Key | Description | Default |
1459+
| ---------------------- | ----------------------------------------------- | -------------------------- |
1460+
| `id` | ID of the secret. | N/A (this key is required) |
1461+
| `env`, `src`, `source` | Environment variable to source the secret from. | `id` if unset. |
1462+
1463+
##### `type=env` usage
1464+
1465+
In the following example, `type=env` is automatically detected because an
1466+
environment variable matching `id` is set.
14311467
1432-
- `id` - ID of the secret. Defaults to `env` name.
1433-
- `env` - Secret environment variable. `id` used if unset, otherwise will look for `src`, `source` if `id` unset.
1468+
```console
1469+
$ SECRET_TOKEN=token docker buildx build --secret id=SECRET_TOKEN .
1470+
```
14341471
14351472
```dockerfile
14361473
# syntax=docker/dockerfile:1
@@ -1440,10 +1477,26 @@ examples: |-
14401477
yarn run test
14411478
```
14421479
1480+
In the following example, the build argument `SECRET_TOKEN` is set to contain
1481+
the value of the environment variable `API_KEY`.
1482+
14431483
```console
1444-
$ SECRET_TOKEN=token docker buildx build --secret id=SECRET_TOKEN .
1484+
$ API_KEY=token docker buildx build --secret id=SECRET_TOKEN,env=API_KEY .
14451485
```
14461486
1487+
You can also specify the name of the environment variable with `src` or `source`:
1488+
1489+
```console
1490+
$ API_KEY=token docker buildx build --secret type=env,id=SECRET_TOKEN,src=API_KEY .
1491+
```
1492+
1493+
> [!NOTE]
1494+
> Specifying the environment variable name with `src` or `source`, you are
1495+
> required to set `type=env` explicitly, or else Buildx assumes that the secret
1496+
> is `type=file`, and looks for a file with the name of `src` or `source` (in
1497+
> this case, a file named `API_KEY` relative to the location where the `docker
1498+
> buildx build` command was executed.
1499+
14471500
### Shared memory size for build containers (--shm-size) {#shm-size}
14481501
14491502
Sets the size of the shared memory allocated for build containers when using

‎data/buildx/docker_buildx_imagetools.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ long: |-
44
The `imagetools` commands contains subcommands for working with manifest lists
55
in container registries. These commands are useful for inspecting manifests
66
to check multi-platform configuration and attestations.
7+
usage: docker buildx imagetools
78
pname: docker buildx
89
plink: docker_buildx.yaml
910
cname:

‎data/buildx/docker_buildx_ls.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,16 @@ options:
3939
experimentalcli: false
4040
kubernetes: false
4141
swarm: false
42+
- option: no-trunc
43+
value_type: bool
44+
default_value: "false"
45+
description: Don't truncate output
46+
deprecated: false
47+
hidden: false
48+
experimental: false
49+
experimentalcli: false
50+
kubernetes: false
51+
swarm: false
4252
inherited_options:
4353
- option: debug
4454
shorthand: D

‎data/buildx/docker_buildx_prune.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,36 @@ options:
5757
value_type: bytes
5858
default_value: "0"
5959
description: Amount of disk space to keep for cache
60+
deprecated: true
61+
hidden: true
62+
experimental: false
63+
experimentalcli: false
64+
kubernetes: false
65+
swarm: false
66+
- option: max-used-space
67+
value_type: bytes
68+
default_value: "0"
69+
description: Maximum amount of disk space allowed to keep for cache
70+
deprecated: false
71+
hidden: false
72+
experimental: false
73+
experimentalcli: false
74+
kubernetes: false
75+
swarm: false
76+
- option: min-free-space
77+
value_type: bytes
78+
default_value: "0"
79+
description: Target amount of free disk space after pruning
80+
deprecated: false
81+
hidden: false
82+
experimental: false
83+
experimentalcli: false
84+
kubernetes: false
85+
swarm: false
86+
- option: reserved-space
87+
value_type: bytes
88+
default_value: "0"
89+
description: Amount of disk space always allowed to keep for cache
6090
deprecated: false
6191
hidden: false
6292
experimental: false

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/docker/docs
33
go 1.23.1
44

55
require (
6-
github.com/docker/buildx v0.17.1 // indirect
6+
github.com/docker/buildx v0.18.0 // indirect
77
github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible // indirect
88
github.com/docker/compose/v2 v2.30.1 // indirect
99
github.com/docker/scout-cli v1.13.0 // indirect
@@ -12,7 +12,7 @@ require (
1212
)
1313

1414
replace (
15-
github.com/docker/buildx => github.com/docker/buildx v0.17.1
15+
github.com/docker/buildx => github.com/docker/buildx v0.18.0
1616
github.com/docker/cli => github.com/docker/cli v27.3.1+incompatible
1717
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.1
1818
github.com/docker/scout-cli => github.com/docker/scout-cli v1.13.0

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ github.com/docker/buildx v0.17.0 h1:Z+QQxsJJPldaeU/4aNXoudFwDDK0/ALFYmDcP5q5fiY=
8282
github.com/docker/buildx v0.17.0/go.mod h1:sBKkoZFs+R2D6ARyQ4/GE/FQHHFsl9PkHdvv/GXAsMo=
8383
github.com/docker/buildx v0.17.1 h1:9ob2jGp4+W9PxWw68GsoNFp+eYFc7eUoRL9VljLCSM4=
8484
github.com/docker/buildx v0.17.1/go.mod h1:kJOhOhS47LRvrLFRulFiO5SE6VJf54yYMn7DzjgO5W0=
85+
github.com/docker/buildx v0.18.0 h1:rSauXHeJt90NvtXrLK5J992Eb0UPJZs2vV3u1zTf1nE=
86+
github.com/docker/buildx v0.18.0/go.mod h1:JGNSshOhHs5FhG3u51jXUf4lLOeD2QBIlJ2vaRB67p4=
8587
github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM=
8688
github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
8789
github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw=

0 commit comments

Comments
 (0)