1
- ARG UBUNTU_VERSION=24.04
1
+ ARG UBUNTU_VERSION=25.10
2
2
3
- ARG H2O_APP_PREFIX=/opt/h2o_app
3
+ ARG H2O_APP_PREFIX=/opt/h2o-app
4
4
5
5
FROM "ubuntu:${UBUNTU_VERSION}" AS compile
6
6
7
7
ARG DEBIAN_FRONTEND=noninteractive
8
8
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 && \
20
9
apt-get -yqq install \
21
10
autoconf \
22
11
bison \
23
12
cmake \
13
+ curl \
24
14
flex \
25
15
g++ \
26
16
libbpfcc-dev \
@@ -50,7 +40,7 @@ RUN curl -LSs "https://github.com/h2o/h2o/archive/${H2O_VERSION}.tar.gz" | \
50
40
cmake \
51
41
-B build \
52
42
-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" \
54
44
-DCMAKE_RANLIB=/usr/bin/gcc-ranlib \
55
45
-DWITH_MRUBY=on \
56
46
-G Ninja \
@@ -63,7 +53,8 @@ ARG MUSTACHE_C_REVISION=7fe52392879d0188c172d94bb4fde7c513d6b929
63
53
WORKDIR /tmp/mustache-c-build
64
54
RUN curl -LSs "https://github.com/x86-64/mustache-c/archive/${MUSTACHE_C_REVISION}.tar.gz" | \
65
55
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 && \
67
58
make -j "$(nproc)" install
68
59
69
60
ARG H2O_APP_PREFIX
@@ -82,25 +73,12 @@ RUN cmake \
82
73
83
74
FROM "ubuntu:${UBUNTU_VERSION}"
84
75
85
- ARG POSTGRESQL_VERSION=17
86
-
87
76
ARG DEBIAN_FRONTEND=noninteractive
88
77
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 && \
100
78
apt-get -yqq install \
101
79
libnuma1 \
102
- libyajl2 \
103
- "postgresql-client-${POSTGRESQL_VERSION}"
80
+ libpq5 \
81
+ libyajl2
104
82
ARG H2O_APP_PREFIX
105
83
COPY --from=compile "${H2O_APP_PREFIX}" "${H2O_APP_PREFIX}/"
106
84
COPY --from=compile /usr/local/lib/libmustache_c.so "${H2O_APP_PREFIX}/lib/"
@@ -113,10 +91,10 @@ ARG TFB_TEST_NAME
113
91
CMD ["taskset" , \
114
92
"-c" , \
115
93
"0" , \
116
- "/opt/h2o_app /bin/h2o_app " , \
94
+ "/opt/h2o-app /bin/h2o-app " , \
117
95
"-a20" , \
118
96
"-d" , \
119
97
"dbname=hello_world host=tfb-database password=benchmarkdbpass sslmode=disable user=benchmarkdbuser" , \
120
98
"-f" , \
121
- "/opt/h2o_app /share/h2o_app /template" , \
99
+ "/opt/h2o-app /share/h2o-app /template" , \
122
100
"-m1" ]
0 commit comments