Skip to content

Commit 7a34553

Browse files
authored
Update the H2O-based implementations to Ubuntu 25.10 (#10062)
Signed-off-by: Anton Kirilov <[email protected]>
1 parent 6b5a302 commit 7a34553

File tree

4 files changed

+23
-45
lines changed

4 files changed

+23
-45
lines changed

frameworks/C/h2o/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.18.0)
2-
project(h2o_app)
2+
project(h2o-app)
33
find_library(CRYPTO_LIB crypto REQUIRED)
44
find_library(H2O_LIB h2o-evloop REQUIRED)
55
find_library(MUSTACHE_C_LIB mustache_c REQUIRED)
@@ -19,7 +19,7 @@ include_directories(${PQ_INCLUDE} ${YAJL_INCLUDE})
1919
set(CMAKE_C_STANDARD 11)
2020
set(CMAKE_C_STANDARD_REQUIRED ON)
2121
add_compile_definitions(H2O_USE_LIBUV=0)
22-
set(COMMON_OPTIONS -flto -pthread)
22+
set(COMMON_OPTIONS -flto=auto -pthread)
2323
add_compile_options(-pedantic -Wall -Wextra ${COMMON_OPTIONS})
2424
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_FORTIFY_SOURCE=2")
2525
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")

frameworks/C/h2o/h2o.dockerfile

Lines changed: 10 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
ARG UBUNTU_VERSION=24.04
1+
ARG UBUNTU_VERSION=25.10
22

3-
ARG H2O_APP_PREFIX=/opt/h2o_app
3+
ARG H2O_APP_PREFIX=/opt/h2o-app
44

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

77
ARG DEBIAN_FRONTEND=noninteractive
88
RUN apt-get -yqq update && \
9-
apt-get -yqq install \
10-
ca-certificates \
11-
curl \
12-
lsb-release && \
13-
install -dm755 /usr/share/postgresql-common/pgdg && \
14-
curl --fail -LSso /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc \
15-
"https://www.postgresql.org/media/keys/ACCC4CF8.asc" && \
16-
sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] \
17-
https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > \
18-
/etc/apt/sources.list.d/pgdg.list' && \
19-
apt-get -yqq update && \
209
apt-get -yqq install \
2110
autoconf \
2211
bison \
2312
cmake \
13+
curl \
2414
flex \
2515
g++ \
2616
libbpfcc-dev \
@@ -50,7 +40,7 @@ RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
5040
cmake \
5141
-B build \
5242
-DCMAKE_AR=/usr/bin/gcc-ar \
53-
-DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
43+
-DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
5444
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
5545
-DWITH_MRUBY=on \
5646
-G Ninja \
@@ -63,7 +53,8 @@ ARG MUSTACHE_C_REVISION=7fe52392879d0188c172d94bb4fde7c513d6b929
6353
WORKDIR /tmp/mustache-c-build
6454
RUN curl -LSs "https://github.com/x86-64/mustache-c/archive/${MUSTACHE_C_REVISION}.tar.gz" | \
6555
tar --strip-components=1 -xz && \
66-
CFLAGS="-flto -march=native -mtune=native -O3" ./autogen.sh && \
56+
CFLAGS="-flto=auto -march=native -mtune=native -O3 -Wno-implicit-function-declaration" \
57+
./autogen.sh && \
6758
make -j "$(nproc)" install
6859

6960
ARG H2O_APP_PREFIX
@@ -82,25 +73,12 @@ RUN cmake \
8273

8374
FROM "ubuntu:${UBUNTU_VERSION}"
8475

85-
ARG POSTGRESQL_VERSION=17
86-
8776
ARG DEBIAN_FRONTEND=noninteractive
8877
RUN apt-get -yqq update && \
89-
apt-get -yqq install \
90-
ca-certificates \
91-
curl \
92-
lsb-release && \
93-
install -dm755 /usr/share/postgresql-common/pgdg && \
94-
curl --fail -LSso /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc \
95-
"https://www.postgresql.org/media/keys/ACCC4CF8.asc" && \
96-
sh -c 'echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] \
97-
https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > \
98-
/etc/apt/sources.list.d/pgdg.list' && \
99-
apt-get -yqq update && \
10078
apt-get -yqq install \
10179
libnuma1 \
102-
libyajl2 \
103-
"postgresql-client-${POSTGRESQL_VERSION}"
80+
libpq5 \
81+
libyajl2
10482
ARG H2O_APP_PREFIX
10583
COPY --from=compile "${H2O_APP_PREFIX}" "${H2O_APP_PREFIX}/"
10684
COPY --from=compile /usr/local/lib/libmustache_c.so "${H2O_APP_PREFIX}/lib/"
@@ -113,10 +91,10 @@ ARG TFB_TEST_NAME
11391
CMD ["taskset", \
11492
"-c", \
11593
"0", \
116-
"/opt/h2o_app/bin/h2o_app", \
94+
"/opt/h2o-app/bin/h2o-app", \
11795
"-a20", \
11896
"-d", \
11997
"dbname=hello_world host=tfb-database password=benchmarkdbpass sslmode=disable user=benchmarkdbuser", \
12098
"-f", \
121-
"/opt/h2o_app/share/h2o_app/template", \
99+
"/opt/h2o-app/share/h2o-app/template", \
122100
"-m1"]

frameworks/PHP/php/php-h2o.dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG H2O_VERSION=c54c63285b52421da2782f028022647fc2ea3dd1
99
ARG DEBIAN_FRONTEND=noninteractive
1010
ARG H2O_PREFIX
1111
WORKDIR /tmp/h2o-build
12-
RUN apt-get -yqq update && \
12+
RUN apt-get -yqq update > /dev/null && \
1313
apt-get -yqq install \
1414
cmake \
1515
curl \
@@ -33,14 +33,14 @@ RUN apt-get -yqq update && \
3333
cmake \
3434
-B build \
3535
-DCMAKE_AR=/usr/bin/gcc-ar \
36-
-DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
36+
-DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
3737
-DCMAKE_INSTALL_PREFIX="${H2O_PREFIX}" \
3838
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
3939
-DWITH_MRUBY=on \
4040
-G Ninja \
41-
-S . > /dev/null && \
41+
-S . > /dev/null && \
4242
cmake --build build -j > /dev/null && \
43-
cmake --install build > /dev/null
43+
cmake --install build > /dev/null
4444

4545
FROM "ubuntu:${UBUNTU_VERSION}"
4646

@@ -49,18 +49,18 @@ ARG PHP_VERSION=8.4
4949
ENV TZ=America/Los_Angeles
5050

5151
ARG DEBIAN_FRONTEND=noninteractive
52-
RUN apt-get -yqq update > /dev/null && \
52+
RUN apt-get -yqq update > /dev/null && \
5353
apt-get -yqq install \
5454
apt-utils \
55-
software-properties-common > /dev/null && \
55+
software-properties-common > /dev/null && \
5656
LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
57-
apt-get -yqq update > /dev/null && \
58-
apt-get -yqq install > /dev/null \
57+
apt-get -yqq update > /dev/null && \
58+
apt-get -yqq install \
5959
"php${PHP_VERSION}" \
6060
"php${PHP_VERSION}-cli" \
6161
"php${PHP_VERSION}-common" \
6262
"php${PHP_VERSION}-fpm" \
63-
"php${PHP_VERSION}-mysql"
63+
"php${PHP_VERSION}-mysql" > /dev/null
6464
ARG H2O_PREFIX
6565
COPY --from=compile "${H2O_PREFIX}/bin/h2o" "${H2O_PREFIX}/bin/"
6666
COPY --from=compile "${H2O_PREFIX}/share" "${H2O_PREFIX}/share/"

frameworks/Ruby/h2o_mruby/h2o_mruby.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG UBUNTU_VERSION=24.04
1+
ARG UBUNTU_VERSION=25.10
22

33
ARG H2O_PREFIX=/opt/h2o
44

@@ -33,7 +33,7 @@ RUN apt-get -yqq update && \
3333
cmake \
3434
-B build \
3535
-DCMAKE_AR=/usr/bin/gcc-ar \
36-
-DCMAKE_C_FLAGS="-flto -march=native -mtune=native" \
36+
-DCMAKE_C_FLAGS="-flto=auto -march=native -mtune=native" \
3737
-DCMAKE_INSTALL_PREFIX="${H2O_PREFIX}" \
3838
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
3939
-DWITH_MRUBY=on \

0 commit comments

Comments
 (0)