Fix a variety of bugs in docker-env
output
#6540
+90
−160
Merged
docker-env
output
#6540