From 96685638019f4cfdf09368e0f9bc56a2f71c4c5f Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 29 Aug 2019 17:40:22 +0900 Subject: [PATCH] Update docker build and doc --- README.rst | 6 +++--- docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 6d521efb..e0341c9b 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Running h2load against HTTP/3 endpoint In order to build h2load with HTTP/3 support, you have to build ngtcp2, nghttp3 and my patched OpenSSL. -https://github.com/ngtcp2/ngtcp2/tree/draft-20#build-from-git +https://github.com/ngtcp2/ngtcp2/tree/draft-22#build-from-git describes how to build these three software. To run h2load against HTTP/3 server, specify h3-22 ALPN with @@ -29,7 +29,7 @@ To run h2load against HTTP/3 server, specify h3-22 ALPN with .. code-block:: text - $ h2load --npn-list h3-22 https://localhost:4433 + $ h2load --npn-list h3-22 https://127.0.0.1:4433 You can use Dockerfile to skip the tedious build steps to manually pull and build dependencies. In order to build Docker image, do this: @@ -43,7 +43,7 @@ Run h2load: .. code-block:: text - $ docker run --rm -it --network=host nghttp2-quic /usr/local/bin/h2load --npn-list h3-22 https://localhost:4433 + $ docker run --rm -it --network=host nghttp2-quic /usr/local/bin/h2load --npn-list h3-22 https://127.0.0.1:4433 Development Status ------------------ diff --git a/docker/Dockerfile b/docker/Dockerfile index 657fce8e..9549a503 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,7 +5,7 @@ RUN /usr/local/bin/clean-install git g++ make binutils autoconf automake autotoo zlib1g libev4 libjemalloc1 libc-ares2 \ ca-certificates psmisc \ python && \ - git clone --depth 1 -b quic-draft-22 https://github.com/tatsuhiro-t/openssl && \ + git clone --depth 1 -b openssl-quic-draft-22 https://github.com/tatsuhiro-t/openssl && \ cd openssl && ./config enable-tls1_3 --openssldir=/etc/ssl && make -j$(nproc) && make install_sw && cd .. && rm -rf openssl && \ git clone --depth 1 https://github.com/ngtcp2/nghttp3 && \ cd nghttp3 && autoreconf -i && \