refactored dockerfile