Skip to content

Commit 07b6cac

Browse files
committed
dockerfile: Enable default SIMD support in Docker (#10215)
According to the documentation, SIMD is supposed to be enabled by default in Fluent Bit container images. This commit updates the Dockerfile to reflect that, enabling SIMD by default. Signed-off-by: jinyong.choi <[email protected]>
1 parent 2fe47eb commit 07b6cac

File tree

7 files changed

+13
-1
lines changed

7 files changed

+13
-1
lines changed

dockerfiles/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ ENV EXTRA_CMAKE_FLAGS=${EXTRA_CMAKE_FLAGS}
7575
# We do not want word splitting for EXTRA_CMAKE_FLAGS in case multiple are defined
7676
# hadolint ignore=SC2086
7777
RUN [ -n "${WAMR_BUILD_TARGET:-}" ] && EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DWAMR_BUILD_TARGET=$WAMR_BUILD_TARGET"; \
78-
cmake -DFLB_RELEASE=On \
78+
cmake -DFLB_SIMD=On \
79+
-DFLB_RELEASE=On \
7980
-DFLB_JEMALLOC=On \
8081
-DFLB_TLS=On \
8182
-DFLB_SHARED_LIB=Off \

dockerfiles/Dockerfile.windows

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ RUN call "%MSVS_HOME%\VC\Auxiliary\Build\vcvars64.bat" && `
159159
cmake -G "NMake Makefiles" `
160160
-DOPENSSL_ROOT_DIR='C:\dev\vcpkg\packages\openssl_x64-windows-static' `
161161
-DFLB_LIBYAML_DIR='C:\dev\vcpkg\packages\libyaml_x64-windows-static' `
162+
-DFLB_SIMD=On `
162163
-DCMAKE_BUILD_TYPE=Release `
163164
-DFLB_SHARED_LIB=Off `
164165
-DFLB_EXAMPLES=Off `

packaging/distros/amazonlinux/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ WORKDIR /tmp/fluent-bit/build/
130130
# ARG CFLAGS
131131
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
132132
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
133+
ARG FLB_SIMD=On
133134
ARG FLB_RELEASE=On
134135
ARG FLB_TRACE=On
135136
ARG FLB_SQLDB=On
@@ -141,6 +142,7 @@ ARG FLB_CHUNK_TRACE=On
141142

142143
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
143144
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
145+
-DFLB_SIMD="$FLB_SIMD" \
144146
-DFLB_RELEASE="$FLB_RELEASE" \
145147
-DFLB_TRACE="$FLB_TRACE" \
146148
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/centos/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ WORKDIR /tmp/fluent-bit/build/
242242
ARG CFLAGS
243243
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
244244
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
245+
ARG FLB_SIMD=On
245246
ARG FLB_RELEASE=On
246247
ARG FLB_TRACE=On
247248
ARG FLB_SQLDB=On
@@ -252,6 +253,7 @@ ARG FLB_CHUNK_TRACE=On
252253

253254
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
254255
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
256+
-DFLB_SIMD="$FLB_SIMD" \
255257
-DFLB_RELEASE="$FLB_RELEASE" \
256258
-DFLB_TRACE="$FLB_TRACE" \
257259
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/debian/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ WORKDIR /tmp/fluent-bit/build/
175175
ARG CFLAGS="-std=gnu99"
176176
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
177177
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
178+
ARG FLB_SIMD=On
178179
ARG FLB_RELEASE=On
179180
ARG FLB_TRACE=On
180181
ARG FLB_SQLDB=On
@@ -187,6 +188,7 @@ ARG FLB_CHUNK_TRACE=On
187188
ENV CFLAGS=$CFLAGS
188189
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
189190
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
191+
-DFLB_SIMD="$FLB_SIMD" \
190192
-DFLB_RELEASE="$FLB_RELEASE" \
191193
-DFLB_TRACE="$FLB_TRACE" \
192194
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/raspbian/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ WORKDIR /tmp/fluent-bit/build/
6363
ARG CFLAGS="-std=gnu99"
6464
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
6565
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
66+
ARG FLB_SIMD=On
6667
ARG FLB_RELEASE=On
6768
ARG FLB_TRACE=On
6869
ARG FLB_SQLDB=On
@@ -77,6 +78,7 @@ ARG WAMR_BUILD_TARGET=ARMV7A
7778
ENV CFLAGS=$CFLAGS
7879
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
7980
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
81+
-DFLB_SIMD="$FLB_SIMD" \
8082
-DFLB_RELEASE="$FLB_RELEASE" \
8183
-DFLB_TRACE="$FLB_TRACE" \
8284
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/ubuntu/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ WORKDIR /tmp/fluent-bit/build/
273273
ARG CFLAGS="-std=gnu99"
274274
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
275275
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
276+
ARG FLB_SIMD=On
276277
ARG FLB_RELEASE=On
277278
ARG FLB_TRACE=On
278279
ARG FLB_SQLDB=On
@@ -285,6 +286,7 @@ ARG FLB_CHUNK_TRACE=On
285286
ENV CFLAGS=$CFLAGS
286287
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
287288
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
289+
-DFLB_SIMD="$FLB_SIMD" \
288290
-DFLB_RELEASE="$FLB_RELEASE" \
289291
-DFLB_TRACE="$FLB_TRACE" \
290292
-DFLB_SQLDB="$FLB_SQLDB" \

0 commit comments

Comments
 (0)