Rework to have docker.client
7 files changed