[ARVADOS] updated: 9108a20c409161bc5a0ed06e2d34918334846acf
git at public.curoverse.com
git at public.curoverse.com
Mon Apr 6 13:49:31 EDT 2015
Summary of changes:
docker/arvdock | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
via 9108a20c409161bc5a0ed06e2d34918334846acf (commit)
from 7bd9cd28b4c655dc2774614e65241a33fc4ca839 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 9108a20c409161bc5a0ed06e2d34918334846acf
Author: Brett Smith <brett at curoverse.com>
Date: Mon Apr 6 13:49:29 2015 -0400
Tighten up DNS check in arvdock.
I got arvdock stuck in an infinite loop because I had the right
nameserver line in /etc/resolv.conf, except it was commented out, so
arvdock kept checking for a name that it would never find. Use awk to
find and check the first functional nameserver line instead.
No issue #.
diff --git a/docker/arvdock b/docker/arvdock
index 26eaba9..a41056c 100755
--- a/docker/arvdock
+++ b/docker/arvdock
@@ -302,8 +302,7 @@ EOF
fi
fi
- `cat /etc/resolv.conf |grep -P "nameserver 172\.17\.42\.1" -q`
- if [[ "$?" == "1" ]]; then
+ if [ "$(awk '($1 == "nameserver"){print $2; exit}' </etc/resolv.conf)" != "172.17.42.1" ]; then
echo
echo "******************************************************************"
echo "To access Arvados you must add the Arvados nameserver to the top"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list