[DO NOT MERGE!] Separate docker compose watch config and fix client container when ru…#1117

s-westphal wants to merge 2 commits into

mastergoogle/grr:masterfrom

test-docker-compose-watchgoogle/grr:test-docker-compose-watchCopy head branch name to clipboard