容器部署重构

@rowanj you may be interested in the previous discussion here: