hs-test: use prebuilt curl with http3 support
Type: improvement
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I4d17ae3f7736dc10c68ca6e304699ea39d012f6c
diff --git a/extras/hs-test/script/build_curl.sh b/extras/hs-test/script/build_curl.sh
index ae675c2..e425894 100755
--- a/extras/hs-test/script/build_curl.sh
+++ b/extras/hs-test/script/build_curl.sh
@@ -1,36 +1,5 @@
#!/bin/bash
-dir1=/tmp/dir1
-dir2=/tmp/dir2
-dir3=/tmp/dir3
-
-git clone --depth 1 -b openssl-3.0.9+quic https://github.com/quictls/openssl
-cd openssl
-echo "install path ${dir1}"
-./config enable-tls1_3 --prefix=${dir1}
-make
-make install
-
-cd ..
-git clone -b v0.12.0 https://github.com/ngtcp2/nghttp3
-cd nghttp3
-autoreconf -fi
-./configure --prefix=${dir2} --enable-lib-only
-make
-make install
-
-cd ..
-git clone -b v0.16.0 https://github.com/ngtcp2/ngtcp2
-cd ngtcp2
-autoreconf -fi
-./configure PKG_CONFIG_PATH=${dir1}/lib64/pkgconfig:${dir2}/lib/pkgconfig LDFLAGS="-Wl,-rpath,${dir1}/lib64" --prefix=${dir3} --enable-lib-only
-make
-make install
-
-cd ..
-git clone https://github.com/curl/curl
-cd curl
-autoreconf -fi
-LDFLAGS="-Wl,-rpath,${dir1}/lib64" ./configure --with-openssl=${dir1} --with-nghttp3=${dir2} --with-ngtcp2=${dir3}
-make
-make install
+wget https://github.com/stunnel/static-curl/releases/download/8.5.0/curl-static-amd64-8.5.0.tar.xz
+tar -xvf ./curl-static-amd64-8.5.0.tar.xz
+cp curl /usr/bin/curl
\ No newline at end of file
diff --git a/extras/hs-test/script/build_hst.sh b/extras/hs-test/script/build_hst.sh
index 0212e77..0897813 100755
--- a/extras/hs-test/script/build_hst.sh
+++ b/extras/hs-test/script/build_hst.sh
@@ -56,7 +56,7 @@
tag=$1
dockername=$2
docker build --build-arg UBUNTU_VERSION --build-arg http_proxy=$HTTP_PROXY \
- -t $tag -f docker/Dockerfile.$dockername .
+ --build-arg https_proxy=$HTTP_PROXY -t $tag -f docker/Dockerfile.$dockername .
}
docker_build hs-test/vpp vpp