Jelajahi Sumber

Update H2O to revision 3b9b6a53c (#10098)

Signed-off-by: Anton Kirilov <[email protected]>
Anton Kirilov 1 hari lalu
induk
melakukan
d1d2b0d3d6

+ 6 - 7
frameworks/C/h2o/h2o.dockerfile

@@ -9,30 +9,29 @@ RUN apt-get -yqq update && \
     apt-get -yqq install \
       autoconf \
       bison \
+      clang \
       cmake \
       curl \
       flex \
-      g++ \
-      libbpfcc-dev \
       libbrotli-dev \
       libcap-dev \
       libnuma-dev \
       libpq-dev \
       libssl-dev \
+      libstdc++-15-dev \
       libtool \
+      liburing-dev \
       libuv1-dev \
       libwslay-dev \
       libyajl-dev \
       libz-dev \
-      llvm-dev \
       make \
       ninja-build \
       pkg-config \
-      rsync \
       ruby \
       systemtap-sdt-dev
 
-ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
+ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402
 
 WORKDIR /tmp/h2o-build
 RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
@@ -78,8 +77,8 @@ RUN apt-get -yqq update && \
     apt-get -yqq install \
       libnuma1 \
       libpq5 \
-      libyajl2 && \
-    apt-get -yqq upgrade
+      liburing2 \
+      libyajl2
 ARG H2O_APP_PREFIX
 COPY --from=compile "${H2O_APP_PREFIX}" "${H2O_APP_PREFIX}/"
 COPY --from=compile /usr/local/lib/libmustache_c.so "${H2O_APP_PREFIX}/lib/"

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

@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
+ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX
@@ -14,18 +14,15 @@ RUN apt-get -yqq update > /dev/null && \
       cmake \
       curl \
       g++ \
-      libbpfcc-dev \
       libbrotli-dev \
       libcap-dev \
       libssl-dev \
-      libtool \
+      liburing-dev \
       libuv1-dev \
       libwslay-dev \
       libz-dev \
-      llvm-dev \
       ninja-build \
       pkg-config \
-      rsync \
       ruby \
       systemtap-sdt-dev > /dev/null && \
     curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
@@ -56,6 +53,7 @@ RUN apt-get -yqq update > /dev/null && \
     LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
     apt-get -yqq update > /dev/null && \
     apt-get -yqq install \
+      liburing2 \
       "php${PHP_VERSION}" \
       "php${PHP_VERSION}-cli" \
       "php${PHP_VERSION}-common" \

+ 3 - 6
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=c54c63285b52421da2782f028022647fc2ea3dd1
+ARG H2O_VERSION=3b9b6a53cac8bcc6a25fb28df81ad295fc5f9402
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX
@@ -14,18 +14,15 @@ RUN apt-get -yqq update && \
       cmake \
       curl \
       g++ \
-      libbpfcc-dev \
       libbrotli-dev \
       libcap-dev \
       libssl-dev \
-      libtool \
+      liburing-dev \
       libuv1-dev \
       libwslay-dev \
       libz-dev \
-      llvm-dev \
       ninja-build \
       pkg-config \
-      rsync \
       ruby \
       systemtap-sdt-dev && \
     curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
@@ -45,7 +42,7 @@ RUN apt-get -yqq update && \
 FROM "ubuntu:${UBUNTU_VERSION}"
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get -yqq update && apt-get -yqq upgrade
+RUN apt-get -yqq update && apt-get -yqq install liburing2
 ARG H2O_PREFIX
 COPY --from=compile "${H2O_PREFIX}/bin/h2o" "${H2O_PREFIX}/bin/"
 COPY --from=compile "${H2O_PREFIX}/share" "${H2O_PREFIX}/share/"