Rebased Dockerignore

Close #4165
Fixes #2224