Skip to content

Commit

Permalink
Merge pull request #351 from zlabjp/bump-nghttp2
Browse files Browse the repository at this point in the history
Bump nghttp2 to v1.62.0
  • Loading branch information
tatsuhiro-t authored May 14, 2024
2 parents a4ac102 + f19ef47 commit 86ab6ff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 32 deletions.
13 changes: 6 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@

FROM debian:12 as build

COPY --link patches/extra-mrbgem.patch patches/0001-nghttpx-Fix-QUIC-stateless-reset-stack-buffer-overfl.patch /
COPY --link patches/extra-mrbgem.patch /

# Inspired by clean-install https://github.com/kubernetes/kubernetes/blob/73641d35c7622ada9910be6fb212d40755cc1f78/build/debian-base/clean-install
RUN apt-get update && \
apt-get install -y --no-install-recommends \
git clang gcc make binutils autoconf automake autotools-dev libtool pkg-config cmake cmake-data \
zlib1g-dev libev-dev libjemalloc-dev ruby-dev libc-ares-dev bison libelf-dev patch libbrotli-dev

RUN git clone --depth 1 -b v1.23.0 https://github.com/aws/aws-lc && \
RUN git clone --depth 1 -b v1.26.0 https://github.com/aws/aws-lc && \
cd aws-lc && \
cmake -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDISABLE_GO=ON && \
make -j$(nproc) -C build && \
cmake --install build && \
cd .. && \
rm -rf aws-lc

RUN git clone --recursive --shallow-submodules --depth 1 -b v1.2.0 https://github.com/ngtcp2/nghttp3 && \
RUN git clone --recursive --shallow-submodules --depth 1 -b v1.3.0 https://github.com/ngtcp2/nghttp3 && \
cd nghttp3 && \
autoreconf -i && \
./configure --enable-lib-only && \
Expand All @@ -44,7 +44,7 @@ RUN git clone --recursive --shallow-submodules --depth 1 -b v1.2.0 https://githu
cd .. && \
rm -rf nghttp3

RUN git clone --recursive --shallow-submodules --depth 1 -b v1.4.0 https://github.com/ngtcp2/ngtcp2 && \
RUN git clone --recursive --shallow-submodules --depth 1 -b v1.5.0 https://github.com/ngtcp2/ngtcp2 && \
cd ngtcp2 && \
autoreconf -i && \
./configure --enable-lib-only --with-boringssl \
Expand All @@ -56,16 +56,15 @@ RUN git clone --recursive --shallow-submodules --depth 1 -b v1.4.0 https://githu
cd .. && \
rm -rf ngtcp2

RUN git clone --depth 1 -b v1.3.0 https://github.com/libbpf/libbpf && \
RUN git clone --depth 1 -b v1.4.2 https://github.com/libbpf/libbpf && \
cd libbpf && \
PREFIX=/usr/local make -C src install && \
cd .. && \
rm -rf libbpf

RUN git clone --recursive --shallow-submodules --depth 1 -b v1.61.0 https://github.com/nghttp2/nghttp2.git && \
RUN git clone --recursive --shallow-submodules --depth 1 -b v1.62.0 https://github.com/nghttp2/nghttp2.git && \
cd nghttp2 && \
patch -p1 < /extra-mrbgem.patch && \
patch -p1 < /0001-nghttpx-Fix-QUIC-stateless-reset-stack-buffer-overfl.patch && \
autoreconf -i && \
./configure --disable-examples --disable-hpack-tools --with-mruby \
--enable-http3 --with-libbpf \
Expand Down

This file was deleted.

0 comments on commit 86ab6ff

Please sign in to comment.