Refactor Dockerfile structure
Build docker base images first
Merge pull request #1 from stefanv/rf/docker_images

Refactor docker images