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 9d9b55b7eb5d..3b2957a9b1ff 100644 --- a/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md +++ b/_vendor/github.com/moby/buildkit/frontend/dockerfile/docs/reference.md @@ -568,8 +568,8 @@ You can also use heredocs with the shell form to break up supported commands. ```dockerfile RUN < [!NOTE] -> Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version. - ```dockerfile RUN --security= ``` @@ -1062,7 +1059,7 @@ Default sandbox mode can be activated via `--security=sandbox`, but that is no-o #### Example: check entitlements ```dockerfile -# syntax=docker/dockerfile:1-labs +# syntax=docker/dockerfile:1 FROM ubuntu RUN --security=insecure cat /proc/self/status | grep CapEff ``` @@ -1434,9 +1431,8 @@ ADD arr[[]0].txt /dest/ When using a local tar archive as the source for `ADD`, and the archive is in a recognized compression format (`gzip`, `bzip2` or `xz`, or uncompressed), the -archive is decompressed and extracted into the specified destination. Only -local tar archives are extracted. If the tar archive is a remote URL, the -archive is not extracted, but downloaded and placed at the destination. +archive is decompressed and extracted into the specified destination. Local tar +archives are extracted by default, see the [`ADD --unpack` flag]. When a directory is extracted, it has the same behavior as `tar -x`. The result is the union of: @@ -1461,6 +1457,9 @@ file. However, like any other file processed during an `ADD`, `mtime` isn't included in the determination of whether or not the file has changed and the cache should be updated. +If remote file is a tar archive, the archive is not extracted by default. To +download and extract the archive, use the [`ADD --unpack` flag]. + If the destination ends with a trailing slash, then the filename is inferred from the URL path. For example, `ADD http://example.com/foobar /` would create the file `/foobar`. The URL must have a nontrivial path so that an appropriate @@ -1595,6 +1594,26 @@ See [`COPY --link`](#copy---link). See [`COPY --exclude`](#copy---exclude). +### ADD --unpack + +```dockerfile +ADD [--unpack=] ... +``` + +The `--unpack` flag controls whether or not to automatically unpack tar +archives (including compressed formats like `gzip` or `bzip2`) when adding them +to the image. Local tar archives are unpacked by default, whereas remote tar +archives (where `src` is a URL) are downloaded without unpacking. + +```dockerfile +# syntax=docker/dockerfile:1 +FROM alpine +# Download and unpack archive.tar.gz into /download: +ADD --unpack=true https://example.com/archive.tar.gz /download +# Add local tar without unpacking: +ADD --unpack=false my-archive.tar.gz . +``` + ## COPY COPY has two forms. @@ -1613,7 +1632,7 @@ The available `[OPTIONS]` are: | [`--chown`](#copy---chown---chmod) | | | [`--chmod`](#copy---chown---chmod) | 1.2 | | [`--link`](#copy---link) | 1.4 | -| [`--parents`](#copy---parents) | 1.7-labs | +| [`--parents`](#copy---parents) | 1.20 | | [`--exclude`](#copy---exclude) | 1.19 | The `COPY` instruction copies new files or directories from `` and adds @@ -1904,9 +1923,6 @@ conditions for cache reuse. ### COPY --parents -> [!NOTE] -> Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version. - ```dockerfile COPY [--parents[=]] ... ``` @@ -1914,7 +1930,7 @@ COPY [--parents[=]] ... The `--parents` flag preserves parent directories for `src` entries. This flag defaults to `false`. ```dockerfile -# syntax=docker/dockerfile:1-labs +# syntax=docker/dockerfile:1 FROM scratch COPY ./x/a.txt ./y/a.txt /no_parents/ @@ -1934,7 +1950,7 @@ directories after it will be preserved. This may be especially useful copies bet with `--from` where the source paths need to be absolute. ```dockerfile -# syntax=docker/dockerfile:1-labs +# syntax=docker/dockerfile:1 FROM scratch COPY --parents ./x/./y/*.txt /parents/ @@ -2829,7 +2845,8 @@ The health check will first run **interval** seconds after the container is started, and then again **interval** seconds after each previous check completes. If a single run of the check takes longer than **timeout** seconds then the check -is considered to have failed. +is considered to have failed. The process performing the check is abruptly stopped +with a `SIGKILL`. It takes **retries** consecutive failures of the health check for the container to be considered `unhealthy`. diff --git a/go.mod b/go.mod index 19404930483d..fd9f9ecef8f0 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,6 @@ replace ( github.com/docker/mcp-gateway => github.com/docker/mcp-gateway v0.22.0 github.com/docker/model-runner/cmd/cli => github.com/docker/model-runner/cmd/cli v0.1.44 github.com/docker/scout-cli => github.com/docker/scout-cli v1.18.4 - github.com/moby/buildkit => github.com/moby/buildkit v0.25.1 + github.com/moby/buildkit => github.com/moby/buildkit v0.26.0 github.com/moby/moby/api => github.com/moby/moby/api v1.52.0 ) diff --git a/go.sum b/go.sum index 2152f25bfc35..d80fda8a6e04 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -github.com/docker/cli v29.0.0+incompatible h1:KgsN2RUFMNM8wChxryicn4p46BdQWpXOA1XLGBGPGAw= -github.com/docker/cli v29.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/buildx v0.30.0 h1:Fz7LzHqEmnE8JNpDPxLWVSKUdD5ysXn2bq8JOpRpvAY= github.com/docker/buildx v0.30.0/go.mod h1:m7/CUbSd2skvugtGYENwn96mk5Ffar28xmLmeAVMc4c= +github.com/docker/cli v29.0.0+incompatible h1:KgsN2RUFMNM8wChxryicn4p46BdQWpXOA1XLGBGPGAw= +github.com/docker/cli v29.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/compose/v2 v2.40.3 h1:XeYkQu1svDtyfZPv5nTwFryQ25ZJMkIlc4pz9HalMPI= github.com/docker/compose/v2 v2.40.3/go.mod h1:iNY1tvoHTyN3C3QHCuWAgj3OjR2T6mGkk/qxfbBF/4M= github.com/docker/mcp-gateway v0.22.0 h1:l4t+HRNHxR7Jn545KDeXaeiEEhkCDBeWMTyuCaXVH7A= @@ -12,5 +12,7 @@ github.com/docker/scout-cli v1.18.4 h1:Td+SSA55WlD7gmrNaBe0imgfVzzQjlfb/prwBn9GO github.com/docker/scout-cli v1.18.4/go.mod h1:Eo1RyCJsx3ldz/YTY5yGxu9g9mwTYbRUutxQUkow3Fc= github.com/moby/buildkit v0.25.1 h1:j7IlVkeNbEo+ZLoxdudYCHpmTsbwKvhgc/6UJ/mY/o8= github.com/moby/buildkit v0.25.1/go.mod h1:phM8sdqnvgK2y1dPDnbwI6veUCXHOZ6KFSl6E164tkc= +github.com/moby/buildkit v0.26.0 h1:OSugMZoGqpVgrlpDx+OkiPRgYCIxR3XUP6wr7brDCpo= +github.com/moby/buildkit v0.26.0/go.mod h1:ylDa7IqzVJgLdi/wO7H1qLREFQpmhFbw2fbn4yoTw40= github.com/moby/moby/api v1.52.0 h1:00BtlJY4MXkkt84WhUZPRqt5TvPbgig2FZvTbe3igYg= github.com/moby/moby/api v1.52.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= diff --git a/hugo.yaml b/hugo.yaml index 5d974cb2c92f..5efa1a7b7f69 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -129,7 +129,7 @@ params: # Latest Docker Compose version compose_version: "v2.40.3" # Latest BuildKit version - buildkit_version: "0.25.0" + buildkit_version: "0.26.0" # Example runtime/library/os versions example_go_version: "1.24"