Collapsed Dockerfile

Collapsing to avoid having to reference a private repository in FROM lines.