Docker: Refactor dockerfile to reduce number of layers