From c57083b08dffa929876e3ce6686a507d646b8ef2 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 1 Oct 2025 11:19:03 +0100 Subject: [PATCH] Update buildkit reference to v0.25.0 (#23479) ## Description https://github.com/moby/buildkit/releases/tag/v0.25.0 ## Related issues or tickets ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review --- .../github.com/moby/buildkit/docs/buildkitd.toml.md | 3 +++ .../buildkit/frontend/dockerfile/docs/reference.md | 11 ++++------- go.mod | 2 +- go.sum | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/_vendor/github.com/moby/buildkit/docs/buildkitd.toml.md b/_vendor/github.com/moby/buildkit/docs/buildkitd.toml.md index 584b69780c..0a0625017b 100644 --- a/_vendor/github.com/moby/buildkit/docs/buildkitd.toml.md +++ b/_vendor/github.com/moby/buildkit/docs/buildkitd.toml.md @@ -178,6 +178,9 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ] http = true # Use HTTPS with self-signed certificates. Do not enable this together with `http`. insecure = true + # If you use token auth with self-signed certificates, + # then buildctl also needs to trust the token provider CA (for example, certificates that are configured for registry) + # because buildctl pulls tokens directly without daemon process ca=["/etc/config/myca.pem"] [[registry."docker.io".keypair]] key="/etc/config/key.pem" 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 3e87ac3a57..9d9b55b7eb 100644 --- a/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md +++ b/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md @@ -1328,7 +1328,7 @@ The available `[OPTIONS]` are: | [`--chown`](#add---chown---chmod) | | | [`--chmod`](#add---chown---chmod) | 1.2 | | [`--link`](#add---link) | 1.4 | -| [`--exclude`](#add---exclude) | 1.7-labs | +| [`--exclude`](#add---exclude) | 1.19 | The `ADD` instruction copies new files or directories from `` and adds them to the filesystem of the image at the path ``. Files and directories @@ -1614,7 +1614,7 @@ The available `[OPTIONS]` are: | [`--chmod`](#copy---chown---chmod) | 1.2 | | [`--link`](#copy---link) | 1.4 | | [`--parents`](#copy---parents) | 1.7-labs | -| [`--exclude`](#copy---exclude) | 1.7-labs | +| [`--exclude`](#copy---exclude) | 1.19 | The `COPY` instruction copies new files or directories from `` and adds them to the filesystem of the image at the path ``. Files and directories @@ -1961,9 +1961,6 @@ with the `--parents` flag, the Buildkit is capable of packing multiple ### COPY --exclude -> [!NOTE] -> Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version. - ```dockerfile COPY [--exclude= ...] ... ``` @@ -1976,7 +1973,7 @@ supporting wildcards and matching using Go's For example, to add all files starting with "hom", excluding files with a `.txt` extension: ```dockerfile -# syntax=docker/dockerfile:1-labs +# syntax=docker/dockerfile:1 FROM scratch COPY --exclude=*.txt hom* /mydir/ @@ -1988,7 +1985,7 @@ even if the files paths match the pattern specified in ``. To add all files starting with "hom", excluding files with either `.txt` or `.md` extensions: ```dockerfile -# syntax=docker/dockerfile:1-labs +# syntax=docker/dockerfile:1 FROM scratch COPY --exclude=*.txt --exclude=*.md hom* /mydir/ diff --git a/go.mod b/go.mod index 1627648ec8..63c74a0615 100644 --- a/go.mod +++ b/go.mod @@ -115,7 +115,7 @@ replace ( github.com/docker/docker => github.com/docker/docker v28.4.0+incompatible github.com/docker/model-cli => github.com/docker/model-cli v0.1.41 github.com/docker/scout-cli => github.com/docker/scout-cli v1.18.1 - github.com/moby/buildkit => github.com/moby/buildkit v0.24.0 + github.com/moby/buildkit => github.com/moby/buildkit v0.25.0 github.com/moby/moby => github.com/moby/moby v28.4.0+incompatible ) diff --git a/go.sum b/go.sum index 89f93b61a6..9830bd95b7 100644 --- a/go.sum +++ b/go.sum @@ -216,6 +216,8 @@ github.com/moby/buildkit v0.23.2 h1:gt/dkfcpgTXKx+B9I310kV767hhVqTvEyxGgI3mqsGQ= github.com/moby/buildkit v0.23.2/go.mod h1:iEjAfPQKIuO+8y6OcInInvzqTMiKMbb2RdJz1K/95a0= github.com/moby/buildkit v0.24.0 h1:qYfTl7W1SIJzWDIDCcPT8FboHIZCYfi++wvySi3eyFE= github.com/moby/buildkit v0.24.0/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k= +github.com/moby/buildkit v0.25.0 h1:cRgh74ymzyHxS5a/lsYT4OCyVU8iC3UgkwasIEUi0og= +github.com/moby/buildkit v0.25.0/go.mod h1:phM8sdqnvgK2y1dPDnbwI6veUCXHOZ6KFSl6E164tkc= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=