Merge "change init container for cockroach"