Merge "Fix docker file location"