more work on docker support