Merge "Update docker installation"