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 a5749ca533..0afa620e2c 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 3e83458659..500a6b9e9f 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 1490486893..ba47eca2db 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=