eliminate dependency on 'curl' on host

...by bundling it in the weavetools image

Closes #351.
This commit is contained in:
Matthias Radestock committed 2015-01-18 17:57:21 +00:00
1 parent 1b229fcc30
commit 719efd0ac4
2 files changed
+13 -6

No files matched your search

+12
View File
@@ -37,4 +37,16 @@ fetch $CONNTRACK
(cd $CONNTRACK; ./configure && make LDFLAGS=-static && rm -f src/conntrack && make LDFLAGS=-all-static)
cp $CONNTRACK/src/conntrack "$BASEDIR"/bin/
# curl
CURL=curl-7.40.0
rm -rf $CURL
curl -s -S http://curl.haxx.se/download/$CURL.tar.gz | tar xvz
(cd $CURL; ./configure --without-ssl --disable-shared && make && rm src/curl && make LDFLAGS=-all-static)
cp $CURL/src/curl "$BASEDIR"/bin/
#
touch "$BASEDIR"/bin
+1 -6
View File
@@ -322,12 +322,7 @@ http_call_ip() {
http_verb="$3"
url="$4"
shift 4
if command_exists curl ; then
curl -s -X $http_verb "$@" http://$ip:$port$url
else
echo "Cannot find curl, which is required for this operation." >&2
exit 1
fi
run_tool host curl -s -X $http_verb "$@" http://$ip:$port$url
}
# Perform operation $1 on container ID $2 to local DNS database at address $3