Better Dockerfile support

It's not perfect, but it's better than what's there now.