Fix docker-env and add unit and integration tests #6604
+72
−25
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.