Make extra container information optional

This commit is contained in:
Bryan Boreham committed 2014-10-24 10:14:32 +01:00
1 parent f7eeb1f844
commit e4fe57a02c
1 file changed
+3 -2
+3 -2
View File
@@ -241,7 +241,8 @@ weave_ps() {
for CONTAINER_ID in $(docker ps -q) ; do
CONTAINER_IPS=$(with_container_netns container_weave_ips $CONTAINER_ID)
if [ -n "$CONTAINER_IPS" ] ; then
echo $(docker inspect --format '{{ .Name }} {{ .Config.Image }} ({{ .Config.Hostname }}.{{ .Config.Domainname }}):' $CONTAINER_ID) $CONTAINER_IPS
[ $# -gt 0 ] && [ "$1" = "-v" ] && CONTAINER_INFO=$(docker inspect --format '{{ .Name }} {{ .Config.Image }}' $CONTAINER_ID)
echo $CONTAINER_ID $CONTAINER_INFO $CONTAINER_IPS
fi
done
}
@@ -304,7 +305,7 @@ case "$COMMAND" in
fi
;;
ps)
weave_ps
weave_ps "$@"
;;
version)
# Try the running container first; if no luck try the image