more setup.sh changes for docker'd use