Skip to content

Commit d467b07

Browse files
authored
Merge pull request docker#19 from thaJeztah/18.03-backport-1044-compress-stream-friend
[18.03-ee] backport Fix panics when --compress and --stream are used together
2 parents 7c6ab1a + 529a324 commit d467b07

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

cli/command/image/build.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
182182
remote string
183183
)
184184

185+
if options.compress && options.stream {
186+
return errors.New("--compress conflicts with --stream options")
187+
}
188+
185189
if options.dockerfileFromStdin() {
186190
if options.contextFromStdin() {
187191
return errors.New("invalid argument: can't use stdin for both build context and dockerfile")

0 commit comments

Comments
 (0)