mirror of https://github.com/docker/cli.git
Merge pull request #3305 from crazy-max/rm-stream
Cleanup leftovers for --stream build flag
This commit is contained in:
commit
4011187b78
|
@ -65,7 +65,6 @@ type buildOptions struct {
|
||||||
squash bool
|
squash bool
|
||||||
target string
|
target string
|
||||||
imageIDFile string
|
imageIDFile string
|
||||||
stream bool
|
|
||||||
platform string
|
platform string
|
||||||
untrusted bool
|
untrusted bool
|
||||||
}
|
}
|
||||||
|
@ -154,9 +153,6 @@ func NewBuildCommand(dockerCli command.Cli) *cobra.Command {
|
||||||
flags.SetAnnotation("squash", "experimental", nil)
|
flags.SetAnnotation("squash", "experimental", nil)
|
||||||
flags.SetAnnotation("squash", "version", []string{"1.25"})
|
flags.SetAnnotation("squash", "version", []string{"1.25"})
|
||||||
|
|
||||||
flags.BoolVar(&options.stream, "stream", false, "Stream attaches to server to negotiate build context")
|
|
||||||
flags.MarkHidden("stream")
|
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,14 +186,6 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
|
||||||
remote string
|
remote string
|
||||||
)
|
)
|
||||||
|
|
||||||
if options.stream {
|
|
||||||
_, _ = fmt.Fprint(dockerCli.Err(), `DEPRECATED: The experimental --stream flag has been removed and the build context
|
|
||||||
will be sent non-streaming. Enable BuildKit instead with DOCKER_BUILDKIT=1
|
|
||||||
to stream build context, see https://docs.docker.com/go/buildkit/
|
|
||||||
|
|
||||||
`)
|
|
||||||
}
|
|
||||||
|
|
||||||
if options.dockerfileFromStdin() {
|
if options.dockerfileFromStdin() {
|
||||||
if options.contextFromStdin() {
|
if options.contextFromStdin() {
|
||||||
return errStdinConflict
|
return errStdinConflict
|
||||||
|
|
Loading…
Reference in New Issue