Refactor dockerfile to use layer cache effciently