Merged docker files