Rebased Dockerignore

Close #4165
Fixes #2224
@vieux I believe you meant `without` :)