Rebased Dockerignore

Close #4165