@@ -55,22 +55,10 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
55
55
flex \
56
56
bison \
57
57
libyaml-dev \
58
- gzip \
58
+ && apt-get satisfy -y cmake "cmake (<< 4.0)" \
59
59
&& apt-get clean \
60
60
&& rm -rf /var/lib/apt/lists/*
61
61
62
- ENV CMAKE_HOME="/opt/cmake"
63
-
64
- ARG CMAKE_VERSION="3.31.6"
65
- ARG CMAKE_URL="https://github.com/Kitware/CMake/releases/download"
66
-
67
- RUN mkdir -p "${CMAKE_HOME}" && \
68
- cmake_download_url="${CMAKE_URL}/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz" && \
69
- echo "Downloading CMake ${CMAKE_VERSION}: ${cmake_download_url} -> ${CMAKE_HOME}" && \
70
- curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
71
-
72
- ENV PATH="${CMAKE_HOME}/bin:${PATH}"
73
-
74
62
# Must be run from root of repo
75
63
WORKDIR /src/fluent-bit/
76
64
COPY . ./
@@ -268,21 +256,10 @@ RUN echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/
268
256
htop atop strace iotop sysstat ncdu logrotate hdparm pciutils psmisc tree pv \
269
257
make tar flex bison \
270
258
libssl-dev libsasl2-dev libsystemd-dev/bookworm-backports zlib1g-dev libpq-dev libyaml-dev postgresql-server-dev-all \
271
- gzip \
259
+ && apt-get satisfy -y cmake "cmake (<< 4.0)" \
272
260
&& apt-get clean \
273
261
&& rm -rf /var/lib/apt/lists/*
274
262
275
- ENV CMAKE_HOME="/opt/cmake"
276
-
277
- ARG CMAKE_VERSION="3.31.6"
278
-
279
- RUN mkdir -p "${CMAKE_HOME}" && \
280
- cmake_url="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(uname -m).tar.gz" && \
281
- echo "Downloading CMake ${CMAKE_VERSION}: ${cmake_url} -> ${CMAKE_HOME}" && \
282
- curl -jksSL "${cmake_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
283
-
284
- ENV PATH="${CMAKE_HOME}/bin:${PATH}"
285
-
286
263
RUN rm -f /usr/bin/qemu-*-static
287
264
COPY --from=builder /fluent-bit /fluent-bit
288
265
0 commit comments