Refactor/dockerfile builder, closes #134