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

Merge pull request #3925 from thaJeztah/fix_warning_typo 

cmd/docker: fix typo in deprecation warning
This commit is contained in:
Sebastiaan van Stijn 2022-12-19 13:57:00 +01:00 committed by GitHub
parent 9a5d5aefb8 06eba426d7
commit 378c92d758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/docker/builder.go
View File

@ -21,7 +21,7 @@ const (
https://docs.docker.com/go/buildx/` https://docs.docker.com/go/buildx/`
buildkitDisabledWarning = `DEPRECATED: The legacy builder is deprecated and will be removed in a future release. buildkitDisabledWarning = `DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
BuildKit is currently disabled; enabled it by removing the DOCKER_BUILDKIT=0 BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0
environment-variable.` environment-variable.`
buildxMissingError = `ERROR: BuildKit is enabled but the buildx component is missing or broken. buildxMissingError = `ERROR: BuildKit is enabled but the buildx component is missing or broken.

2
cmd/docker/builder_test.go
View File

@ -155,7 +155,7 @@ func TestBuildkitDisabled(t *testing.T) {
output.Assert(t, b.String(), map[int]func(string) error{ output.Assert(t, b.String(), map[int]func(string) error{
0: output.Suffix("DEPRECATED: The legacy builder is deprecated and will be removed in a future release."), 0: output.Suffix("DEPRECATED: The legacy builder is deprecated and will be removed in a future release."),
1: output.Suffix("BuildKit is currently disabled; enabled it by removing the DOCKER_BUILDKIT=0"), 1: output.Suffix("BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0"),
}) })
} }

2
e2e/image/build_test.go
View File

@ -37,7 +37,7 @@ func TestBuildFromContextDirectoryWithTag(t *testing.T) {
defer icmd.RunCommand("docker", "image", "rm", "myimage") defer icmd.RunCommand("docker", "image", "rm", "myimage")
const buildkitDisabledWarning = `DEPRECATED: The legacy builder is deprecated and will be removed in a future release. const buildkitDisabledWarning = `DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
BuildKit is currently disabled; enabled it by removing the DOCKER_BUILDKIT=0 BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0
environment-variable. environment-variable.
` `