fixes #4671 Added Docker Suport