Merge pull request #884 from rade/881_get_container_id_on_start

LGTM. Fixes #881
This commit is contained in:
Bryan Boreham committed 2015-06-10 17:20:25 +01:00
commit ae8985deb5
2 files changed
+36 -2

No files matched your search

+3 -2
View File
@@ -1048,12 +1048,13 @@ case "$COMMAND" in
collect_cidr_args "$@"
shift $CIDR_COUNT
[ $# -eq 1 ] || usage
CONTAINER=$(docker start $1)
RES=$(docker start $1)
CONTAINER=$(container_id $1)
create_bridge
get_ipam_cidr $CONTAINER
with_container_netns_or_die $CONTAINER attach $CIDR_ARGS
when_dns_running with_container_fqdn $CONTAINER put_dns_fqdn $CIDR_ARGS
echo $CONTAINER
echo $RES
;;
attach)
collect_cidr_args "$@"