Add docker addr flag and check for etcd_machines