Add autodetect for container support.
3 files changed