Dockerfile
Recover if setting up the watch causes a panic
Do not apt-get update, shrink docker image by ~130MB
merge upstream