[Git][wine/wine][master] 2 commits: gitlab: Merge the platform docker files back into a single file.