فهرست منبع

Update H2O to revision 13ba727ad (#8134)

Also, switch the base image for h2o_mruby to Ubuntu 22.04.
Anton Kirilov 2 سال پیش
والد
کامیت
66fcee888c
3فایلهای تغییر یافته به همراه18 افزوده شده و 10 حذف شده
  1. 1 1
      frameworks/C/h2o/h2o.dockerfile
  2. 3 2
      frameworks/PHP/php/php-h2o.dockerfile
  3. 14 7
      frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

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

@@ -28,7 +28,7 @@ RUN apt-get -yqq update && \
       pkg-config \
       systemtap-sdt-dev
 
-ARG H2O_VERSION=71224be1ac250502f27528e988d3a673dcf2055f
+ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
 
 WORKDIR /tmp/h2o-build
 RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \

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

@@ -4,7 +4,7 @@ ARG H2O_PREFIX=/opt/h2o
 
 FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=9ab3feb4d7429ddda52a3cf84bd6da0e890bd52a
+ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX
@@ -57,7 +57,8 @@ RUN apt-get -yqq update && \
       "php${PHP_VERSION}-fpm" \
       "php${PHP_VERSION}-mysql"
 ARG H2O_PREFIX
-COPY --from=compile "${H2O_PREFIX}" "${H2O_PREFIX}/"
+COPY --from=compile "${H2O_PREFIX}/bin/h2o" "${H2O_PREFIX}/bin/"
+COPY --from=compile "${H2O_PREFIX}/share" "${H2O_PREFIX}/share/"
 COPY deploy/conf "/etc/php/${PHP_VERSION}/fpm/"
 RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" \
       "/etc/php/${PHP_VERSION}/fpm/php-fpm.conf"; fi;

+ 14 - 7
frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

@@ -1,10 +1,10 @@
-ARG RUBY_IMAGE_VERSION=3.2
+ARG UBUNTU_VERSION=22.04
 
 ARG H2O_PREFIX=/opt/h2o
 
-FROM "ruby:${RUBY_IMAGE_VERSION}" AS compile
+FROM "ubuntu:${UBUNTU_VERSION}" AS compile
 
-ARG H2O_VERSION=9ab3feb4d7429ddda52a3cf84bd6da0e890bd52a
+ARG H2O_VERSION=13ba727ad12dfb2338165d2bcfb2136457e33c8a
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG H2O_PREFIX
@@ -12,10 +12,18 @@ WORKDIR /tmp/h2o-build
 RUN apt-get -yqq update && \
     apt-get -yqq install \
       cmake \
+      curl \
+      g++ \
+      libbrotli-dev \
       libcap-dev \
+      libssl-dev \
+      libtool \
       libuv1-dev \
       libwslay-dev \
+      libz-dev \
       ninja-build \
+      pkg-config \
+      ruby \
       systemtap-sdt-dev && \
     curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
       tar --strip-components=1 -xz && \
@@ -31,12 +39,11 @@ RUN apt-get -yqq update && \
     cmake --build build -j && \
     cmake --install build
 
-FROM ruby:${RUBY_IMAGE_VERSION}-slim
+FROM "ubuntu:${UBUNTU_VERSION}"
 
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get -yqq update && apt-get -yqq install libcap2
 ARG H2O_PREFIX
-COPY --from=compile "${H2O_PREFIX}" "${H2O_PREFIX}/"
+COPY --from=compile "${H2O_PREFIX}/bin/h2o" "${H2O_PREFIX}/bin/"
+COPY --from=compile "${H2O_PREFIX}/share" "${H2O_PREFIX}/share/"
 COPY h2o.conf "${H2O_PREFIX}/etc/"
 EXPOSE 8080
 ARG BENCHMARK_ENV