Docker fixes

Collapse Dockerfile, use private repo.