Browse Source

Update the H2O-based implementations to Ubuntu 24.04 (#8879)

Anton Kirilov 1 year ago
parent
commit
9f3a5c3a75

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

@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 
 ARG H2O_APP_PREFIX=/opt/h2o_app
 ARG H2O_APP_PREFIX=/opt/h2o_app
 
 
@@ -25,6 +25,7 @@ RUN apt-get -yqq update && \
       libwslay-dev \
       libwslay-dev \
       libyajl-dev \
       libyajl-dev \
       libz-dev \
       libz-dev \
+      llvm-dev \
       make \
       make \
       ninja-build \
       ninja-build \
       pkg-config \
       pkg-config \
@@ -46,8 +47,7 @@ RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
       -G Ninja \
       -G Ninja \
       -S . && \
       -S . && \
     cmake --build build -j && \
     cmake --build build -j && \
-    cmake --install build && \
-    cp -a deps/picotls/include/picotls* deps/quicly/include/quicly* /usr/local/include
+    cmake --install build
 
 
 ARG MUSTACHE_C_REVISION=7fe52392879d0188c172d94bb4fde7c513d6b929
 ARG MUSTACHE_C_REVISION=7fe52392879d0188c172d94bb4fde7c513d6b929
 
 

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

@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 
 ARG H2O_PREFIX=/opt/h2o
 ARG H2O_PREFIX=/opt/h2o
 
 
@@ -22,6 +22,7 @@ RUN apt-get -yqq update && \
       libuv1-dev \
       libuv1-dev \
       libwslay-dev \
       libwslay-dev \
       libz-dev \
       libz-dev \
+      llvm-dev \
       ninja-build \
       ninja-build \
       pkg-config \
       pkg-config \
       rsync \
       rsync \

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

@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 
 ARG H2O_PREFIX=/opt/h2o
 ARG H2O_PREFIX=/opt/h2o
 
 
@@ -22,6 +22,7 @@ RUN apt-get -yqq update && \
       libuv1-dev \
       libuv1-dev \
       libwslay-dev \
       libwslay-dev \
       libz-dev \
       libz-dev \
+      llvm-dev \
       ninja-build \
       ninja-build \
       pkg-config \
       pkg-config \
       rsync \
       rsync \