Rebased Dockerignore

Close #4165
Fixes #2224
I think this has been fixed in #6766