dockerfile refactor