Skip to content

Commit 992aa45

Browse files
authored
Update H2O to revision 18b175f71 (#8826)
1 parent 46f68ae commit 992aa45

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

frameworks/C/h2o/h2o.dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN apt-get -yqq update && \
1313
curl \
1414
flex \
1515
g++ \
16+
libbpfcc-dev \
1617
libbrotli-dev \
1718
libcap-dev \
1819
libicu-dev \
@@ -27,9 +28,11 @@ RUN apt-get -yqq update && \
2728
make \
2829
ninja-build \
2930
pkg-config \
31+
rsync \
32+
ruby \
3033
systemtap-sdt-dev
3134

32-
ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
35+
ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
3336

3437
WORKDIR /tmp/h2o-build
3538
RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
@@ -39,6 +42,7 @@ RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
3942
-DCMAKE_AR=/usr/bin/gcc-ar \
4043
-DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
4144
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
45+
-DWITH_MRUBY=on \
4246
-G Ninja \
4347
-S . && \
4448
cmake --build build -j && \

frameworks/PHP/php/php-h2o.dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
44

55
FROM "ubuntu:${UBUNTU_VERSION}" AS compile
66

7-
ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
7+
ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
88

99
ARG DEBIAN_FRONTEND=noninteractive
1010
ARG H2O_PREFIX
@@ -14,6 +14,7 @@ RUN apt-get -yqq update && \
1414
cmake \
1515
curl \
1616
g++ \
17+
libbpfcc-dev \
1718
libbrotli-dev \
1819
libcap-dev \
1920
libssl-dev \
@@ -23,6 +24,8 @@ RUN apt-get -yqq update && \
2324
libz-dev \
2425
ninja-build \
2526
pkg-config \
27+
rsync \
28+
ruby \
2629
systemtap-sdt-dev && \
2730
curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
2831
tar --strip-components=1 -xz && \
@@ -32,6 +35,7 @@ RUN apt-get -yqq update && \
3235
-DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
3336
-DCMAKE_INSTALL_PREFIX="${H2O_PREFIX}" \
3437
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
38+
-DWITH_MRUBY=on \
3539
-G Ninja \
3640
-S . && \
3741
cmake --build build -j && \

frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
44

55
FROM "ubuntu:${UBUNTU_VERSION}" AS compile
66

7-
ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
7+
ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
88

99
ARG DEBIAN_FRONTEND=noninteractive
1010
ARG H2O_PREFIX
@@ -14,6 +14,7 @@ RUN apt-get -yqq update && \
1414
cmake \
1515
curl \
1616
g++ \
17+
libbpfcc-dev \
1718
libbrotli-dev \
1819
libcap-dev \
1920
libssl-dev \
@@ -23,6 +24,7 @@ RUN apt-get -yqq update && \
2324
libz-dev \
2425
ninja-build \
2526
pkg-config \
27+
rsync \
2628
ruby \
2729
systemtap-sdt-dev && \
2830
curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \

0 commit comments

Comments
 (0)