Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com> Conflicts: integration-cli/docker_cli_build_test.go Upstream-commit: af2021955cb01507984cbd076edaf3caaf5b89b3 Component: engine
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com> Conflicts: integration-cli/docker_cli_build_test.go Upstream-commit: af2021955cb01507984cbd076edaf3caaf5b89b3 Component: engine