trying to combine it back to one dockerfile