Merge vagrant Dockerfile into repository and use folder-based structure
Separate out and improve the server image