refactor docker stuff