Make make_container a context manager so we can reliably clean up containers that were created in tests.