Browse Source

Update H2O to revision 18b175f71 (#8826)

Anton Kirilov 1 year ago
parent
commit
992aa4565d

+ 5 - 1
frameworks/C/h2o/h2o.dockerfile

@@ -13,6 +13,7 @@ RUN apt-get -yqq update && \
       curl \
       flex \
       g++ \
+      libbpfcc-dev \
       libbrotli-dev \
       libcap-dev \
       libicu-dev \
@@ -27,9 +28,11 @@ RUN apt-get -yqq update && \
       make \
       ninja-build \
       pkg-config \
+      rsync \
+      ruby \
       systemtap-sdt-dev
 
-ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
+ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
 
 WORKDIR /tmp/h2o-build
 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" | \
       -DCMAKE_AR=/usr/bin/gcc-ar \
       -DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
       -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
+      -DWITH_MRUBY=on \
       -G Ninja \
       -S . && \
     cmake --build build -j && \

+ 5 - 1
frameworks/PHP/php/php-h2o.dockerfile

@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
+ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX
@@ -14,6 +14,7 @@ RUN apt-get -yqq update && \
       cmake \
       curl \
       g++ \
+      libbpfcc-dev \
       libbrotli-dev \
       libcap-dev \
       libssl-dev \
@@ -23,6 +24,8 @@ RUN apt-get -yqq update && \
       libz-dev \
       ninja-build \
       pkg-config \
+      rsync \
+      ruby \
       systemtap-sdt-dev && \
     curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
       tar --strip-components=1 -xz && \
@@ -32,6 +35,7 @@ RUN apt-get -yqq update && \
       -DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
       -DCMAKE_INSTALL_PREFIX="${H2O_PREFIX}" \
       -DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
+      -DWITH_MRUBY=on \
       -G Ninja \
       -S . && \
     cmake --build build -j && \

+ 3 - 1
frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
+ARG H2O_VERSION=18b175f71ede08b50d3e5ae8303dacef3ea510fc
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX
@@ -14,6 +14,7 @@ RUN apt-get -yqq update && \
       cmake \
       curl \
       g++ \
+      libbpfcc-dev \
       libbrotli-dev \
       libcap-dev \
       libssl-dev \
@@ -23,6 +24,7 @@ RUN apt-get -yqq update && \
       libz-dev \
       ninja-build \
       pkg-config \
+      rsync \
       ruby \
       systemtap-sdt-dev && \
     curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \