Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge e2986f4467 into 917d2dc837

This commit is contained in:
Sebastiaan van Stijn 2024-11-09 01:45:13 +01:00 committed by GitHub
parent 917d2dc837 e2986f4467
commit ef1405f869
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/docker/docker.go
View File

@ -572,7 +572,16 @@ func areFlagsSupported(cmd *cobra.Command, details versionDetails) error {
if _, ok := f.Annotations["experimental"]; ok && !details.ServerInfo().HasExperimental { if _, ok := f.Annotations["experimental"]; ok && !details.ServerInfo().HasExperimental {
errs = append(errs, fmt.Sprintf(`"--%s" is only supported on a Docker daemon with experimental features enabled`, f.Name)) errs = append(errs, fmt.Sprintf(`"--%s" is only supported on a Docker daemon with experimental features enabled`, f.Name))
} }
// buildkit-specific flags are noop when buildkit is not enabled, so we do not add an error in that case if _, ok := f.Annotations["buildkit"]; ok {
if v, _ := command.BuildKitEnabled(details.ServerInfo()); !v {
errs = append(errs, fmt.Sprintf(`"--%s" is only supported with BuildKit enabled. Enable BuildKit with DOCKER_BUILDKIT=1`, f.Name))
}
}
if _, ok := f.Annotations["no-buildkit"]; ok {
if v, _ := command.BuildKitEnabled(details.ServerInfo()); v {
errs = append(errs, fmt.Sprintf(`"--%s" is not supported with BuildKit enabled. Disable BuildKit with DOCKER_BUILDKIT=0`, f.Name))
}
}
}) })
if len(errs) > 0 { if len(errs) > 0 {
return errors.New(strings.Join(errs, "\n")) return errors.New(strings.Join(errs, "\n"))