Merge pull request #1105 from vdemeester/1044-compress-stream-friend

Fix panics when --compress and --stream are used together
Upstream-commit: d1cc8c731e
Component: cli
This commit is contained in:
Vincent Demeester
2018-06-01 23:00:01 +02:00
committed by GitHub

View File

@ -182,6 +182,10 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
remote string
)
if options.compress && options.stream {
return errors.New("--compress conflicts with --stream options")
}
if options.dockerfileFromStdin() {
if options.contextFromStdin() {
return errors.New("invalid argument: can't use stdin for both build context and dockerfile")