Merge pull request #21350 from dvdksn/vendor-buildkit-354f2d13c905c05b0c4f44ff9c2d1e61430212bc

vendor: github.com/moby/buildkit 354f2d13c905c05b0c4f44ff9c2d1e61430212bc
This commit is contained in:
David Karlsson 2024-11-06 13:26:05 +01:00 committed by GitHub
commit ce9fa9cd67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 43 additions and 26 deletions

View File

@ -943,7 +943,6 @@ The command is run in the host's network environment (similar to
> which needs to be enabled when starting the buildkitd daemon with
> `--allow-insecure-entitlement network.host` flag or in [buildkitd config](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md),
> and for a build request with [`--allow network.host` flag](https://docs.docker.com/engine/reference/commandline/buildx_build/#allow).
{ .warning }
### RUN --security
@ -964,7 +963,6 @@ This is equivalent to running `docker run --privileged`.
> enabled when starting the buildkitd daemon with
> `--allow-insecure-entitlement security.insecure` flag or in [buildkitd config](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md),
> and for a build request with [`--allow security.insecure` flag](https://docs.docker.com/engine/reference/commandline/buildx_build/#allow).
{ .warning }
Default sandbox mode can be activated via `--security=sandbox`, but that is no-op.
@ -2261,7 +2259,6 @@ runtime, runs the relevant `ENTRYPOINT` and `CMD` commands.
>
> On Windows, the user must be created first if it's not a built-in account.
> This can be done with the `net user` command called as part of a Dockerfile.
{ .warning }
```dockerfile
FROM microsoft/windowsservercore
@ -2332,7 +2329,6 @@ flag.
>
> Refer to the [`RUN --mount=type=secret`](#run---mounttypesecret) section to
> learn about secure ways to use secrets when building images.
{ .warning }
A Dockerfile may include one or more `ARG` instructions. For example,
the following is a valid Dockerfile:

View File

@ -1,6 +1,7 @@
---
title: ConsistentInstructionCasing
description: All commands within the Dockerfile should use the same casing (either upper or lower)
description: >-
All commands within the Dockerfile should use the same casing (either upper or lower)
aliases:
- /go/dockerfile/rule/consistent-instruction-casing/
---

View File

@ -1,6 +1,7 @@
---
title: CopyIgnoredFile
description: Attempting to Copy file that is excluded by .dockerignore
description: >-
Attempting to Copy file that is excluded by .dockerignore
aliases:
- /go/dockerfile/rule/copy-ignored-file/
---

View File

@ -1,6 +1,7 @@
---
title: DuplicateStageName
description: Stage names should be unique
description: >-
Stage names should be unique
aliases:
- /go/dockerfile/rule/duplicate-stage-name/
---

View File

@ -1,6 +1,7 @@
---
title: FromAsCasing
description: The 'as' keyword should match the case of the 'from' keyword
description: >-
The 'as' keyword should match the case of the 'from' keyword
aliases:
- /go/dockerfile/rule/from-as-casing/
---

View File

@ -1,6 +1,7 @@
---
title: FromPlatformFlagConstDisallowed
description: FROM --platform flag should not use a constant value
description: >-
FROM --platform flag should not use a constant value
aliases:
- /go/dockerfile/rule/from-platform-flag-const-disallowed/
---

View File

@ -1,6 +1,7 @@
---
title: InvalidDefaultArgInFrom
description: Default value for global ARG results in an empty or invalid base image name
description: >-
Default value for global ARG results in an empty or invalid base image name
aliases:
- /go/dockerfile/rule/invalid-default-arg-in-from/
---

View File

@ -1,6 +1,7 @@
---
title: InvalidDefinitionDescription
description: "Comment for build stage or argument should follow the format: `# <arg/stage name> <description>`. If this is not intended to be a description comment, add an empty line or comment between the instruction and the comment."
description: >-
Comment for build stage or argument should follow the format: `# <arg/stage name> <description>`. If this is not intended to be a description comment, add an empty line or comment between the instruction and the comment.
aliases:
- /go/dockerfile/rule/invalid-definition-description/
---

View File

@ -1,6 +1,7 @@
---
title: JSONArgsRecommended
description: JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals
description: >-
JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals
aliases:
- /go/dockerfile/rule/json-args-recommended/
---

View File

@ -1,6 +1,7 @@
---
title: LegacyKeyValueFormat
description: Legacy key/value format with whitespace separator should not be used
description: >-
Legacy key/value format with whitespace separator should not be used
aliases:
- /go/dockerfile/rule/legacy-key-value-format/
---

View File

@ -1,6 +1,7 @@
---
title: MaintainerDeprecated
description: The MAINTAINER instruction is deprecated, use a label instead to define an image author
description: >-
The MAINTAINER instruction is deprecated, use a label instead to define an image author
aliases:
- /go/dockerfile/rule/maintainer-deprecated/
---

View File

@ -1,6 +1,7 @@
---
title: MultipleInstructionsDisallowed
description: Multiple instructions of the same type should not be used in the same stage
description: >-
Multiple instructions of the same type should not be used in the same stage
aliases:
- /go/dockerfile/rule/multiple-instructions-disallowed/
---

View File

@ -1,6 +1,7 @@
---
title: NoEmptyContinuation
description: Empty continuation lines will become errors in a future release
description: >-
Empty continuation lines will become errors in a future release
aliases:
- /go/dockerfile/rule/no-empty-continuation/
---

View File

@ -1,6 +1,7 @@
---
title: RedundantTargetPlatform
description: Setting platform to predefined $TARGETPLATFORM in FROM is redundant as this is the default behavior
description: >-
Setting platform to predefined $TARGETPLATFORM in FROM is redundant as this is the default behavior
aliases:
- /go/dockerfile/rule/redundant-target-platform/
---

View File

@ -1,6 +1,7 @@
---
title: ReservedStageName
description: Reserved words should not be used as stage names
description: >-
Reserved words should not be used as stage names
aliases:
- /go/dockerfile/rule/reserved-stage-name/
---

View File

@ -1,6 +1,7 @@
---
title: SecretsUsedInArgOrEnv
description: Sensitive data should not be used in the ARG or ENV commands
description: >-
Sensitive data should not be used in the ARG or ENV commands
aliases:
- /go/dockerfile/rule/secrets-used-in-arg-or-env/
---

View File

@ -1,6 +1,7 @@
---
title: StageNameCasing
description: Stage names should be lowercase
description: >-
Stage names should be lowercase
aliases:
- /go/dockerfile/rule/stage-name-casing/
---

View File

@ -1,6 +1,7 @@
---
title: UndefinedArgInFrom
description: FROM command must use declared ARGs
description: >-
FROM command must use declared ARGs
aliases:
- /go/dockerfile/rule/undefined-arg-in-from/
---

View File

@ -1,6 +1,7 @@
---
title: UndefinedVar
description: Variables should be defined before their use
description: >-
Variables should be defined before their use
aliases:
- /go/dockerfile/rule/undefined-var/
---

View File

@ -1,6 +1,7 @@
---
title: WorkdirRelativePath
description: Relative workdir without an absolute workdir declared within the build can have unexpected results if the base image changes
description: >-
Relative workdir without an absolute workdir declared within the build can have unexpected results if the base image changes
aliases:
- /go/dockerfile/rule/workdir-relative-path/
---

View File

@ -1,5 +1,5 @@
# github.com/moby/moby v27.3.1+incompatible
# github.com/moby/buildkit v0.17.0
# github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905
# github.com/docker/buildx v0.18.0
# github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible
# github.com/docker/compose/v2 v2.30.1

4
go.mod
View File

@ -7,7 +7,7 @@ require (
github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible // indirect
github.com/docker/compose/v2 v2.30.1 // indirect
github.com/docker/scout-cli v1.15.0 // indirect
github.com/moby/buildkit v0.17.0 // indirect
github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 // indirect
github.com/moby/moby v27.3.1+incompatible // indirect
)
@ -16,6 +16,6 @@ replace (
github.com/docker/cli => github.com/docker/cli v27.3.1+incompatible
github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.30.1
github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0
github.com/moby/buildkit => github.com/moby/buildkit v0.17.0
github.com/moby/buildkit => github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905
github.com/moby/moby => github.com/moby/moby v27.3.1+incompatible
)

2
go.sum
View File

@ -306,6 +306,8 @@ github.com/moby/buildkit v0.16.0 h1:wOVBj1o5YNVad/txPQNXUXdelm7Hs/i0PUFjzbK0VKE=
github.com/moby/buildkit v0.16.0/go.mod h1:Xqx/5GlrqE1yIRORk0NSCVDFpQAU1WjlT6KHYZdisIQ=
github.com/moby/buildkit v0.17.0 h1:ZA/4AxwBbve1f3ZaNNJQiCBtTV62R6YweWNwq4A+sTc=
github.com/moby/buildkit v0.17.0/go.mod h1:ru8NFyDHD8HbuKaLXJIjK9nr3x6FZR+IWjtF07S+wdM=
github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905 h1:KMEmQThIQYXKvBurcvM+6zZjxP2CoNSsF/wUpW+RC/E=
github.com/moby/buildkit v0.17.1-0.20241031124041-354f2d13c905/go.mod h1:ru8NFyDHD8HbuKaLXJIjK9nr3x6FZR+IWjtF07S+wdM=
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=