diff options
| author |   Florin Coras <fcoras@cisco.com> | 2023-12-21 19:18:25 -0800 |
|---|---|---|
| committer |   Dave Barach <vpp@barachs.net> | 2023-12-22 17:19:11 +0000 |
| commit | f26bbeac4bc3f46d15664bc76baaf17bb4bb655c (patch) | |
| tree | 43ab76020e0e7221c45ab3ef6945a9a6c042d78f | |
| parent | 7e452ba15cade36feb864b8570401f14fa8503e3 (diff) | |
hs-test: use prebuilt curl with http3 support
Type: improvement
Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I4d17ae3f7736dc10c68ca6e304699ea39d012f6c
| -rw-r--r-- | extras/hs-test/docker/Dockerfile.curl | 2 | ||||
| -rwxr-xr-x | extras/hs-test/script/build_curl.sh | 37 | ||||
| -rwxr-xr-x | extras/hs-test/script/build_hst.sh | 2 |
3 files changed, 5 insertions, 36 deletions
diff --git a/extras/hs-test/docker/Dockerfile.curl b/extras/hs-test/docker/Dockerfile.curl index 21f8f54e186..81d15e86c82 100644 --- a/extras/hs-test/docker/Dockerfile.curl +++ b/extras/hs-test/docker/Dockerfile.curl @@ -1,7 +1,7 @@ FROM hs-test/build COPY script/build_curl.sh /build_curl.sh -RUN git clone https://github.com/curl/curl +RUN apt-get update && apt-get install wget RUN /build_curl.sh CMD ["/bin/sh"] diff --git a/extras/hs-test/script/build_curl.sh b/extras/hs-test/script/build_curl.sh index ae675c270fe..e4258946f9e 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 0212e776aec..0897813db72 100755 --- a/extras/hs-test/script/build_hst.sh +++ b/extras/hs-test/script/build_hst.sh @@ -56,7 +56,7 @@ docker_build () { 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 |