reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1938 from weaveworks/issues/1827-stopped-version

Browse Source 
Check if container is running before using its image to ask for version
This commit is contained in:
Adam Harrison committed 2016-01-29 15:57:15 +00:00
2 parents 11ccada740 b9502ee1cd
commit 81c49e6005
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
weave
+4 -4
View File
@@ -813,10 +813,10 @@ router_opts_bridged_fastdp() {
}
ask_version() {
if ! DOCKERIMAGE=$(docker inspect --format='{{.Image}}' $1 2>/dev/null) ; then
if ! DOCKERIMAGE=$(docker inspect --format='{{.Id}}' $2 2>/dev/null) ; then
echo "Unable to find $2 image." >&2
fi
if check_running $1 2>/dev/null ; then
DOCKERIMAGE=$(docker inspect --format='{{.Image}}' $1 )
elif ! DOCKERIMAGE=$(docker inspect --format='{{.Id}}' $2 2>/dev/null) ; then
echo "Unable to find $2 image." >&2
fi
[ -n "$DOCKERIMAGE" ] && docker run --rm --net=none -e WEAVE_CIDR=none $3 $DOCKERIMAGE $COVERAGE_ARGS --version
}