Merge "Improve docker installation"