Docker build for ros and ros_comm variants

Let's remove what we don't need instead of commenting out, so that we can get quicker to a cleaner (easier to comment on) build script