From 559d554cf1e50328db4d501a1abbf0f5fb5776e4 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Mon, 20 Jan 2025 19:13:14 +0000 Subject: [PATCH 1/6] vendor: github.com/docker/buildx v0.20.0 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../docker/buildx/docs/bake-reference.md | 4 +- _vendor/modules.txt | 4 +- data/buildx/docker_buildx.yaml | 2 + data/buildx/docker_buildx_bake.yaml | 56 +++++++++++++++++-- data/buildx/docker_buildx_build.yaml | 10 +++- data/buildx/docker_buildx_debug_build.yaml | 2 +- data/buildx/docker_buildx_history.yaml | 46 +++++++++++++++ .../buildx/docker_buildx_history_inspect.yaml | 38 +++++++++++++ ...ker_buildx_history_inspect_attachment.yaml | 53 ++++++++++++++++++ data/buildx/docker_buildx_history_logs.yaml | 45 +++++++++++++++ data/buildx/docker_buildx_history_ls.yaml | 55 ++++++++++++++++++ data/buildx/docker_buildx_history_open.yaml | 34 +++++++++++ data/buildx/docker_buildx_history_rm.yaml | 45 +++++++++++++++ go.mod | 6 +- go.sum | 2 + 15 files changed, 386 insertions(+), 16 deletions(-) create mode 100644 data/buildx/docker_buildx_history.yaml create mode 100644 data/buildx/docker_buildx_history_inspect.yaml create mode 100644 data/buildx/docker_buildx_history_inspect_attachment.yaml create mode 100644 data/buildx/docker_buildx_history_logs.yaml create mode 100644 data/buildx/docker_buildx_history_ls.yaml create mode 100644 data/buildx/docker_buildx_history_open.yaml create mode 100644 data/buildx/docker_buildx_history_rm.yaml diff --git a/_vendor/github.com/docker/buildx/docs/bake-reference.md b/_vendor/github.com/docker/buildx/docs/bake-reference.md index 19483210a5be..192dded4fe60 100644 --- a/_vendor/github.com/docker/buildx/docs/bake-reference.md +++ b/_vendor/github.com/docker/buildx/docs/bake-reference.md @@ -19,8 +19,8 @@ By default, Bake uses the following lookup order to find the configuration file: 3. `docker-compose.yml` 4. `docker-compose.yaml` 5. `docker-bake.json` -6. `docker-bake.override.json` -7. `docker-bake.hcl` +6. `docker-bake.hcl` +7. `docker-bake.override.json` 8. `docker-bake.override.hcl` You can specify the file location explicitly using the `--file` flag: diff --git a/_vendor/modules.txt b/_vendor/modules.txt index ee53a1a18a46..3a19633bb399 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v27.5.0+incompatible -# github.com/moby/buildkit v0.18.1 -# github.com/docker/buildx v0.19.2 +# github.com/moby/buildkit v0.19.0 +# github.com/docker/buildx v0.20.0 # github.com/docker/cli v27.5.0+incompatible # github.com/docker/compose/v2 v2.32.4 # github.com/docker/scout-cli v1.15.0 diff --git a/data/buildx/docker_buildx.yaml b/data/buildx/docker_buildx.yaml index c13fe0b3c354..4c786feff7d9 100644 --- a/data/buildx/docker_buildx.yaml +++ b/data/buildx/docker_buildx.yaml @@ -11,6 +11,7 @@ cname: - docker buildx debug - docker buildx dial-stdio - docker buildx du + - docker buildx history - docker buildx imagetools - docker buildx inspect - docker buildx ls @@ -26,6 +27,7 @@ clink: - docker_buildx_debug.yaml - docker_buildx_dial-stdio.yaml - docker_buildx_du.yaml + - docker_buildx_history.yaml - docker_buildx_imagetools.yaml - docker_buildx_inspect.yaml - docker_buildx_ls.yaml diff --git a/data/buildx/docker_buildx_bake.yaml b/data/buildx/docker_buildx_bake.yaml index 0836a274ae8b..203d066a00a1 100644 --- a/data/buildx/docker_buildx_bake.yaml +++ b/data/buildx/docker_buildx_bake.yaml @@ -59,24 +59,34 @@ options: experimentalcli: false kubernetes: false swarm: false + - option: list + value_type: string + description: List targets or variables + details_url: '#list' + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false - option: list-targets value_type: bool default_value: "false" description: List available targets - deprecated: false + deprecated: true hidden: true experimental: false - experimentalcli: true + experimentalcli: false kubernetes: false swarm: false - option: list-variables value_type: bool default_value: "false" description: List defined variables - deprecated: false + deprecated: true hidden: true experimental: false - experimentalcli: true + experimentalcli: false kubernetes: false swarm: false - option: load @@ -125,7 +135,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output + Set type of progress output (`auto`, `quiet`, `plain`, `tty`, `rawjson`). Use plain to show container output details_url: '#progress' deprecated: false hidden: false @@ -259,6 +269,42 @@ examples: |- See the [Bake file reference](/build/bake/reference/) for more details. + ### List targets and variables (--list) {#list} + + The `--list` flag displays all available targets or variables in the Bake + configuration, along with a description (if set using the `description` + property in the Bake file). + + To list all targets: + + ```console {title="List targets"} + $ docker buildx bake --list=targets + TARGET DESCRIPTION + binaries + default binaries + update-docs + validate + validate-golangci Validate .golangci.yml schema (does not run Go linter) + ``` + + To list variables: + + ```console + $ docker buildx bake --list=variables + VARIABLE VALUE DESCRIPTION + REGISTRY docker.io/username Registry and namespace + IMAGE_NAME my-app Image name + GO_VERSION + ``` + + By default, the output of `docker buildx bake --list` is presented in a table + format. Alternatively, you can use a long-form CSV syntax and specify a + `format` attribute to output the list in JSON. + + ```console + $ docker buildx bake --list=type=targets,format=json + ``` + ### Write build results metadata to a file (--metadata-file) {#metadata-file} Similar to [`buildx build --metadata-file`](/reference/cli/docker/buildx/build/#metadata-file) but diff --git a/data/buildx/docker_buildx_build.yaml b/data/buildx/docker_buildx_build.yaml index b1dc9c44de09..39d13d3ac098 100644 --- a/data/buildx/docker_buildx_build.yaml +++ b/data/buildx/docker_buildx_build.yaml @@ -355,7 +355,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output + Set type of progress output (`auto`, `quiet`, `plain`, `tty`, `rawjson`). Use plain to show container output details_url: '#progress' deprecated: false hidden: false @@ -1317,8 +1317,12 @@ examples: |- --progress=VALUE ``` - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use `plain` to show container - output (default `auto`). + Set type of progress output. Supported values are: + - `auto` (default): Uses the `tty` mode if the client is a TTY, or `plain` otherwise + - `tty`: An interactive stream of the output with color and redrawing + - `plain`: Prints the raw build progress in a plaintext format + - `quiet`: Suppress the build output and print image ID on success (same as `--quiet`) + - `rawjson`: Prints the raw build progress as JSON lines > [!NOTE] > You can also use the `BUILDKIT_PROGRESS` environment variable to set its value. diff --git a/data/buildx/docker_buildx_debug_build.yaml b/data/buildx/docker_buildx_debug_build.yaml index dccc8aa96f3a..38c3faa67ec6 100644 --- a/data/buildx/docker_buildx_debug_build.yaml +++ b/data/buildx/docker_buildx_debug_build.yaml @@ -337,7 +337,7 @@ options: value_type: string default_value: auto description: | - Set type of progress output (`auto`, `plain`, `tty`, `rawjson`). Use plain to show container output + Set type of progress output (`auto`, `quiet`, `plain`, `tty`, `rawjson`). Use plain to show container output deprecated: false hidden: false experimental: false diff --git a/data/buildx/docker_buildx_history.yaml b/data/buildx/docker_buildx_history.yaml new file mode 100644 index 000000000000..e3e172193522 --- /dev/null +++ b/data/buildx/docker_buildx_history.yaml @@ -0,0 +1,46 @@ +command: docker buildx history +short: Commands to work on build records +long: Commands to work on build records +usage: docker buildx history +pname: docker buildx +plink: docker_buildx.yaml +cname: + - docker buildx history inspect + - docker buildx history logs + - docker buildx history ls + - docker buildx history open + - docker buildx history rm +clink: + - docker_buildx_history_inspect.yaml + - docker_buildx_history_logs.yaml + - docker_buildx_history_ls.yaml + - docker_buildx_history_open.yaml + - docker_buildx_history_rm.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_inspect.yaml b/data/buildx/docker_buildx_history_inspect.yaml new file mode 100644 index 000000000000..f226342956ce --- /dev/null +++ b/data/buildx/docker_buildx_history_inspect.yaml @@ -0,0 +1,38 @@ +command: docker buildx history inspect +short: Inspect a build +long: Inspect a build +usage: docker buildx history inspect [OPTIONS] [REF] +pname: docker buildx history +plink: docker_buildx_history.yaml +cname: + - docker buildx history inspect attachment +clink: + - docker_buildx_history_inspect_attachment.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_inspect_attachment.yaml b/data/buildx/docker_buildx_history_inspect_attachment.yaml new file mode 100644 index 000000000000..c43308120bba --- /dev/null +++ b/data/buildx/docker_buildx_history_inspect_attachment.yaml @@ -0,0 +1,53 @@ +command: docker buildx history inspect attachment +short: Inspect a build attachment +long: Inspect a build attachment +usage: docker buildx history inspect attachment [OPTIONS] REF [DIGEST] +pname: docker buildx history inspect +plink: docker_buildx_history_inspect.yaml +options: + - option: platform + value_type: string + description: Platform of attachment + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: type + value_type: string + description: Type of attachment + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_logs.yaml b/data/buildx/docker_buildx_history_logs.yaml new file mode 100644 index 000000000000..c6afba47cda9 --- /dev/null +++ b/data/buildx/docker_buildx_history_logs.yaml @@ -0,0 +1,45 @@ +command: docker buildx history logs +short: Print the logs of a build +long: Print the logs of a build +usage: docker buildx history logs [OPTIONS] [REF] +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: progress + value_type: string + default_value: plain + description: Set type of progress output (plain, rawjson, tty) + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_ls.yaml b/data/buildx/docker_buildx_history_ls.yaml new file mode 100644 index 000000000000..a1bdf1833ee1 --- /dev/null +++ b/data/buildx/docker_buildx_history_ls.yaml @@ -0,0 +1,55 @@ +command: docker buildx history ls +short: List build records +long: List build records +usage: docker buildx history ls +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: format + value_type: string + default_value: table + description: Format the output + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: no-trunc + value_type: bool + default_value: "false" + description: Don't truncate output + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_open.yaml b/data/buildx/docker_buildx_history_open.yaml new file mode 100644 index 000000000000..e79b0ba56997 --- /dev/null +++ b/data/buildx/docker_buildx_history_open.yaml @@ -0,0 +1,34 @@ +command: docker buildx history open +short: Open a build in Docker Desktop +long: Open a build in Docker Desktop +usage: docker buildx history open [OPTIONS] [REF] +pname: docker buildx history +plink: docker_buildx_history.yaml +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/data/buildx/docker_buildx_history_rm.yaml b/data/buildx/docker_buildx_history_rm.yaml new file mode 100644 index 000000000000..aa3ddd173cbb --- /dev/null +++ b/data/buildx/docker_buildx_history_rm.yaml @@ -0,0 +1,45 @@ +command: docker buildx history rm +short: Remove build records +long: Remove build records +usage: docker buildx history rm [OPTIONS] [REF...] +pname: docker buildx history +plink: docker_buildx_history.yaml +options: + - option: all + value_type: bool + default_value: "false" + description: Remove all build records + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +inherited_options: + - option: builder + value_type: string + description: Override the configured builder instance + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false + - option: debug + shorthand: D + value_type: bool + default_value: "false" + description: Enable debug logging + deprecated: false + hidden: false + experimental: false + experimentalcli: false + kubernetes: false + swarm: false +deprecated: false +hidden: false +experimental: false +experimentalcli: false +kubernetes: false +swarm: false + diff --git a/go.mod b/go.mod index 295c5f5b6f99..3e83458659f8 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,16 @@ module github.com/docker/docs go 1.23.1 require ( - github.com/docker/buildx v0.19.2 // indirect + github.com/docker/buildx v0.20.0 // indirect github.com/docker/cli v27.5.0+incompatible // indirect github.com/docker/compose/v2 v2.32.4 // indirect github.com/docker/scout-cli v1.15.0 // indirect - github.com/moby/buildkit v0.18.1 // indirect + github.com/moby/buildkit v0.19.0 // indirect github.com/moby/moby v27.5.0+incompatible // indirect ) replace ( - github.com/docker/buildx => github.com/docker/buildx v0.19.2 + github.com/docker/buildx => github.com/docker/buildx v0.20.0 github.com/docker/cli => github.com/docker/cli v27.5.0+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 diff --git a/go.sum b/go.sum index d3b46ccdf9ad..149048689303 100644 --- a/go.sum +++ b/go.sum @@ -88,6 +88,8 @@ github.com/docker/buildx v0.19.1 h1:muQEvRJLvOCS0p/67gPwjnQPWqE5ot3sGkb2Eq7vCmw= github.com/docker/buildx v0.19.1/go.mod h1:k4WP+XmGRYL0a7l4RZAI2TqpwhuAuSQ5U/rosRgFmAA= github.com/docker/buildx v0.19.2 h1:2zXzgP2liQKgQ5BiOqMc+wz7hfWgAIMWw5MR6QDG++I= github.com/docker/buildx v0.19.2/go.mod h1:k4WP+XmGRYL0a7l4RZAI2TqpwhuAuSQ5U/rosRgFmAA= +github.com/docker/buildx v0.20.0 h1:XM2EvwEfohbxLPAheVm03biNHpspB/dA6U9F0c6yJsI= +github.com/docker/buildx v0.20.0/go.mod h1:VVi4Nvo4jd/IkRvwyExbIyW7u82fivK61MRx5I0oKic= github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM= github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw= From 2c74df2578609ade64c83629cd39c8e26e333d9a Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:31:28 +0100 Subject: [PATCH 2/6] buildx: create stub files for new history command Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .../cli/docker/buildx/history/_index.md | 16 ++++++++++++++++ .../cli/docker/buildx/history/inspect/_index.md | 16 ++++++++++++++++ .../docker/buildx/history/inspect/attachment.md | 16 ++++++++++++++++ .../reference/cli/docker/buildx/history/logs.md | 16 ++++++++++++++++ .../reference/cli/docker/buildx/history/ls.md | 16 ++++++++++++++++ .../reference/cli/docker/buildx/history/open.md | 16 ++++++++++++++++ .../reference/cli/docker/buildx/history/rm.md | 16 ++++++++++++++++ 7 files changed, 112 insertions(+) create mode 100644 content/reference/cli/docker/buildx/history/_index.md create mode 100644 content/reference/cli/docker/buildx/history/inspect/_index.md create mode 100644 content/reference/cli/docker/buildx/history/inspect/attachment.md create mode 100644 content/reference/cli/docker/buildx/history/logs.md create mode 100644 content/reference/cli/docker/buildx/history/ls.md create mode 100644 content/reference/cli/docker/buildx/history/open.md create mode 100644 content/reference/cli/docker/buildx/history/rm.md diff --git a/content/reference/cli/docker/buildx/history/_index.md b/content/reference/cli/docker/buildx/history/_index.md new file mode 100644 index 000000000000..cf0454729c0b --- /dev/null +++ b/content/reference/cli/docker/buildx/history/_index.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history +title: docker buildx history +layout: cli +aliases: +- /engine/reference/commandline/buildx_history/ +--- + + diff --git a/content/reference/cli/docker/buildx/history/inspect/_index.md b/content/reference/cli/docker/buildx/history/inspect/_index.md new file mode 100644 index 000000000000..533b40c6c4a6 --- /dev/null +++ b/content/reference/cli/docker/buildx/history/inspect/_index.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_inspect +title: docker buildx history inspect +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_inspect/ +--- + + diff --git a/content/reference/cli/docker/buildx/history/inspect/attachment.md b/content/reference/cli/docker/buildx/history/inspect/attachment.md new file mode 100644 index 000000000000..49a17b2f8b8a --- /dev/null +++ b/content/reference/cli/docker/buildx/history/inspect/attachment.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_inspect_attachment +title: docker buildx history inspect attachment +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_inspect_attachment/ +--- + + diff --git a/content/reference/cli/docker/buildx/history/logs.md b/content/reference/cli/docker/buildx/history/logs.md new file mode 100644 index 000000000000..c859717f04a3 --- /dev/null +++ b/content/reference/cli/docker/buildx/history/logs.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_logs +title: docker buildx history logs +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_logs/ +--- + + diff --git a/content/reference/cli/docker/buildx/history/ls.md b/content/reference/cli/docker/buildx/history/ls.md new file mode 100644 index 000000000000..5bb38651bd17 --- /dev/null +++ b/content/reference/cli/docker/buildx/history/ls.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_ls +title: docker buildx history ls +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_ls/ +--- + + diff --git a/content/reference/cli/docker/buildx/history/open.md b/content/reference/cli/docker/buildx/history/open.md new file mode 100644 index 000000000000..e7b98ef293dd --- /dev/null +++ b/content/reference/cli/docker/buildx/history/open.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_open +title: docker buildx history open +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_open/ +--- + + diff --git a/content/reference/cli/docker/buildx/history/rm.md b/content/reference/cli/docker/buildx/history/rm.md new file mode 100644 index 000000000000..744a68175a97 --- /dev/null +++ b/content/reference/cli/docker/buildx/history/rm.md @@ -0,0 +1,16 @@ +--- +datafolder: buildx +datafile: docker_buildx_history_rm +title: docker buildx history rm +layout: cli +aliases: +- /engine/reference/commandline/buildx_history_rm/ +--- + + From f466e4881b5820602428a00bfd896fe2f351f502 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Tue, 21 Jan 2025 13:54:16 +0100 Subject: [PATCH 3/6] vendor: github.com/moby/buildkit v0.19.0 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../frontend/dockerfile/docs/reference.md | 27 ++++++++++--------- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md b/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md index a5749ca533cc..0afa620e2cd2 100644 --- a/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md +++ b/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md @@ -1280,11 +1280,11 @@ relative to the build context. For example, if the build context is the current directory, `ADD file.txt /` adds the file at `./file.txt` to the root of the filesystem in the build container. -When adding source files from the build context, their paths are interpreted as -relative to the root of the context. If you specify a relative path leading -outside of the build context, such as `ADD ../something /something`, parent -directory paths are stripped out automatically. The effective source path in -this example becomes `ADD something /something`. +Specifying a source path with a leading slash or one that navigates outside the +build context, such as `ADD ../something /something`, automatically removes any +parent directory navigation (`../`). Trailing slashes in the source path are +also disregarded, making `ADD something/ /something` equivalent to `ADD +something /something`. If the source is a directory, the contents of the directory are copied, including filesystem metadata. The directory itself isn't copied, only its @@ -1476,8 +1476,8 @@ ADD [--checksum=] ... ``` The `--checksum` flag lets you verify the checksum of a remote resource. The -checksum is formatted as `:`. The supported algorithms are -`sha256`, `sha384`, and `sha512`. +checksum is formatted as `sha256:`. SHA-256 is the only supported hash +algorithm. ```dockerfile ADD --checksum=sha256:24454f830cdb571e2c4ad15481119c43b3cafd48dd869a9b2945d1036d1dc68d https://mirrors.edge.kernel.org/pub/linux/kernel/Historic/linux-0.01.tar.gz / @@ -1556,11 +1556,14 @@ For more information about copying from named sources, see the #### Copying from the build context -When copying source files from the build context, their paths are interpreted as -relative to the root of the context. If you specify a relative path leading -outside of the build context, such as `COPY ../something /something`, parent -directory paths are stripped out automatically. The effective source path in -this example becomes `COPY something /something`. +When copying source files from the build context, paths are interpreted as +relative to the root of the context. + +Specifying a source path with a leading slash or one that navigates outside the +build context, such as `COPY ../something /something`, automatically removes +any parent directory navigation (`../`). Trailing slashes in the source path +are also disregarded, making `COPY something/ /something` equivalent to `COPY +something /something`. If the source is a directory, the contents of the directory are copied, including filesystem metadata. The directory itself isn't copied, only its diff --git a/go.mod b/go.mod index 3e83458659f8..500a6b9e9f24 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,6 @@ replace ( github.com/docker/cli => github.com/docker/cli v27.5.0+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.32.4 github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0 - github.com/moby/buildkit => github.com/moby/buildkit v0.18.0 + github.com/moby/buildkit => github.com/moby/buildkit v0.19.0 github.com/moby/moby => github.com/moby/moby v27.5.0+incompatible ) diff --git a/go.sum b/go.sum index 149048689303..ba47eca2db11 100644 --- a/go.sum +++ b/go.sum @@ -333,6 +333,8 @@ github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 h1:KMEmQThIQYXKvB github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905/go.mod h1:ru8NFyDHD8HbuKaLXJIjK9nr3x6FZR+IWjtF07S+wdM= github.com/moby/buildkit v0.18.0 h1:KSelhNINJcNA3FCWBbGCytvicjP+kjU5kZlZhkTUkVo= github.com/moby/buildkit v0.18.0/go.mod h1:vCR5CX8NGsPTthTg681+9kdmfvkvqJBXEv71GZe5msU= +github.com/moby/buildkit v0.19.0 h1:w9G1p7sArvCGNkpWstAqJfRQTXBKukMyMK1bsah1HNo= +github.com/moby/buildkit v0.19.0/go.mod h1:WiHBFTgWV8eB1AmPxIWsAlKjUACAwm3X/14xOV4VWew= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/moby v24.0.2+incompatible h1:yH+5dRHH1x3XRKzl1THA2aGTy6CHYnkt5N924ADMax8= github.com/moby/moby v24.0.2+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= From e8842a8d01ce516e11bd747ed219e88291c4ad10 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:05:07 +0100 Subject: [PATCH 4/6] build: buildx v0.20.0 release notes Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/build/release-notes.md | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/content/manuals/build/release-notes.md b/content/manuals/build/release-notes.md index 9e27b9f79b1b..0c995aaf89bc 100644 --- a/content/manuals/build/release-notes.md +++ b/content/manuals/build/release-notes.md @@ -10,6 +10,38 @@ toc_max: 2 This page contains information about the new features, improvements, and bug fixes in [Docker Buildx](https://github.com/docker/buildx). +## 0.20.0 + +{{< release-date date="2025-01-20" >}} + +The full release note for this release is available +[on GitHub](https://github.com/docker/buildx/releases/tag/v0.20.0). + +### New + +- New `buildx history` command has been added that allows working with build records of completed and running builds. You can use these commands to list, inspect, remove your builds, replay the logs of already completed builds, and quickly open your builds in Docker Desktop Build UI for further debugging. This is an early version of this command and we expect to add more features in the future releases. [#2891](https://github.com/docker/buildx/pull/2891), [#2925](https://github.com/docker/buildx/pull/2925) + +### Enhancements + +- Bake: Definition now supports new object notation for the fields that previously required CSV strings as inputs (`attest`, `output`, `cache-from`, `cache-to`, `secret`, `ssh`). [docker/buildx#2758](https://github.com/docker/buildx/pull/2758), [docker/buildx#2848](https://github.com/docker/buildx/pull/2848), [docker/buildx#2871](https://github.com/docker/buildx/pull/2871), [docker/buildx#2814](https://github.com/docker/buildx/pull/2814) +- Bake: Filesystem entitlements now error by default. To disable this behavior, you can set `BUILDX_BAKE_ENTITLEMENTS_FS=0`. [docker/buildx#2875](https://github.com/docker/buildx/pull/2875) +- Bake: Infer Git authentication token from remote files to build request. [docker/buildx#2905](https://github.com/docker/buildx/pull/2905) +- Bake: Add support for `--list` flag to list targets and variables. [docker/buildx#2900](https://github.com/docker/buildx/pull/2900), [docker/buildx#2907](https://github.com/docker/buildx/pull/2907) +- Bake: Update lookup order for default definition files to load the files with "override" suffix later. [docker/buildx#2886](https://github.com/docker/buildx/pull/2886) + +### Bug fixes + +- Bake: Fix entitlements check for default SSH socket. [docker/buildx#2898](https://github.com/docker/buildx/pull/2898) +- Bake: Fix missing default target in group's default targets. [docker/buildx#2863](https://github.com/docker/buildx/pull/2863) +- Bake: Fix named context from target platform matching. [docker/buildx#2877](https://github.com/docker/buildx/pull/2877) +- Fix missing documentation for quiet progress mode. [docker/buildx#2899](https://github.com/docker/buildx/pull/2899) +- Fix missing last progress from loading layers. [docker/buildx#2876](https://github.com/docker/buildx/pull/2876) +- Validate BuildKit configuration before creating a builder. [docker/buildx#2864](https://github.com/docker/buildx/pull/2864) + +### Packaging + +- Compose compatibility has been updated to v2.4.7. [docker/buildx#2893](https://github.com/docker/buildx/pull/2893), [docker/buildx#2857](https://github.com/docker/buildx/pull/2857), [docker/buildx#2829](https://github.com/docker/buildx/pull/2829) + ## 0.19.1 {{< release-date date="2024-11-27" >}} From 9cdce0c0cc2b26f6435d42612dde2a9aecab5364 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:10:47 +0100 Subject: [PATCH 5/6] build: dockerfile v0.13.0 release notes Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../buildkit/dockerfile-release-notes.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/content/manuals/build/buildkit/dockerfile-release-notes.md b/content/manuals/build/buildkit/dockerfile-release-notes.md index e05d4751de97..94f5ebd328bb 100644 --- a/content/manuals/build/buildkit/dockerfile-release-notes.md +++ b/content/manuals/build/buildkit/dockerfile-release-notes.md @@ -13,6 +13,37 @@ issues, and bug fixes in [Dockerfile reference](/reference/dockerfile.md). For usage, see the [Dockerfile frontend syntax](frontend.md) page. +## 1.13.0 + +{{< release-date date="2025-01-20" >}} + +The full release note for this release is available +[on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.13.0). + +```dockerfile +# syntax=docker/dockerfile:1.13.0 +``` + +- New `TARGETOSVERSION`, `BUILDOSVERSION` builtin build-args are available for Windows builds, and `TARGETPLATFORM` value now also contains `OSVersion` value. [moby/buildkit#5614](https://github.com/moby/buildkit/pull/5614) +- Allow syntax forwarding for external frontends for files starting with a Byte Order Mark (BOM). [moby/buildkit#5645](https://github.com/moby/buildkit/pull/5645) +- Default `PATH` in Windows Containers has been updated with `powershell.exe` directory. [moby/buildkit#5446](https://github.com/moby/buildkit/pull/5446) +- Fix Dockerfile directive parsing to not allow invalid syntax. [moby/buildkit#5646](https://github.com/moby/buildkit/pull/5646) +- Fix case where `ONBUILD` command may have run twice on inherited stage. [moby/buildkit#5593](https://github.com/moby/buildkit/pull/5593) +- Fix possible missing named context replacement for child stages in Dockerfile. [moby/buildkit#5596](https://github.com/moby/buildkit/pull/5596) + +## 1.13.0-labs + +{{< release-date date="2025-01-20" >}} + +The full release note for this release is available +[on GitHub](https://github.com/moby/buildkit/releases/tag/dockerfile%2F1.13.0-labs). + +```dockerfile +# syntax=docker.io/docker/dockerfile-upstream:1.13.0-labs +``` + +- Fix support for non-octal values for `COPY --chmod`. [moby/buildkit#5626](https://github.com/moby/buildkit/pull/5626) + ## 1.12.0 {{< release-date date="2024-11-27" >}} From 705190702afe041272281bd56275fa3a387d98c9 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:20:48 +0100 Subject: [PATCH 6/6] build: remove experimental callout for bake Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/build/bake/_index.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/content/manuals/build/bake/_index.md b/content/manuals/build/bake/_index.md index 24d630a9ea3d..93dfc11b946e 100644 --- a/content/manuals/build/bake/_index.md +++ b/content/manuals/build/bake/_index.md @@ -6,13 +6,6 @@ aliases: - /build/customize/bake/ --- -{{% experimental %}} - -Bake is an experimental feature, and we are looking for -[feedback from users](https://github.com/docker/buildx/issues). - -{{% /experimental %}} - Bake is a feature of Docker Buildx that lets you define your build configuration using a declarative file, as opposed to specifying a complex CLI expression. It also lets you run multiple builds concurrently with a single invocation.