Skip to content

Commit 06d8967

Browse files
committed
dockerfile: Enable default SIMD support in Docker (fluent#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 <inimax801@gmail.com>
1 parent 7636151 commit 06d8967

File tree

6 files changed

+12
-1
lines changed

6 files changed

+12
-1
lines changed

dockerfiles/Dockerfile

+2-1
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 \

packaging/distros/amazonlinux/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ WORKDIR /tmp/fluent-bit/build/
7777
ARG CFLAGS
7878
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
7979
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
80+
ARG FLB_SIMD=On
8081
ARG FLB_RELEASE=On
8182
ARG FLB_TRACE=On
8283
ARG FLB_SQLDB=On
@@ -88,6 +89,7 @@ ARG FLB_CHUNK_TRACE=On
8889

8990
RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
9091
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
92+
-DFLB_SIMD="$FLB_SIMD" \
9193
-DFLB_RELEASE="$FLB_RELEASE" \
9294
-DFLB_TRACE="$FLB_TRACE" \
9395
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/centos/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ WORKDIR /tmp/fluent-bit/build/
166166
ARG CFLAGS
167167
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
168168
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
169+
ARG FLB_SIMD=On
169170
ARG FLB_RELEASE=On
170171
ARG FLB_TRACE=On
171172
ARG FLB_SQLDB=On
@@ -177,6 +178,7 @@ ARG FLB_CHUNK_TRACE=On
177178
# cmake3 exists in every image - cmake references the older cmake2 in centos 7
178179
RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
179180
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
181+
-DFLB_SIMD="$FLB_SIMD" \
180182
-DFLB_RELEASE="$FLB_RELEASE" \
181183
-DFLB_TRACE="$FLB_TRACE" \
182184
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/debian/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ WORKDIR /tmp/fluent-bit/build/
109109
ARG CFLAGS="-std=gnu99"
110110
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
111111
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
112+
ARG FLB_SIMD=On
112113
ARG FLB_RELEASE=On
113114
ARG FLB_TRACE=On
114115
ARG FLB_SQLDB=On
@@ -121,6 +122,7 @@ ARG FLB_CHUNK_TRACE=On
121122
ENV CFLAGS=$CFLAGS
122123
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
123124
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
125+
-DFLB_SIMD="$FLB_SIMD" \
124126
-DFLB_RELEASE="$FLB_RELEASE" \
125127
-DFLB_TRACE="$FLB_TRACE" \
126128
-DFLB_SQLDB="$FLB_SQLDB" \

packaging/distros/raspbian/Dockerfile

+2
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

+2
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ WORKDIR /tmp/fluent-bit/build/
171171
ARG CFLAGS="-std=gnu99"
172172
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
173173
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
174+
ARG FLB_SIMD=On
174175
ARG FLB_RELEASE=On
175176
ARG FLB_TRACE=On
176177
ARG FLB_SQLDB=On
@@ -183,6 +184,7 @@ ARG FLB_CHUNK_TRACE=On
183184
ENV CFLAGS=$CFLAGS
184185
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
185186
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
187+
-DFLB_SIMD="$FLB_SIMD" \
186188
-DFLB_RELEASE="$FLB_RELEASE" \
187189
-DFLB_TRACE="$FLB_TRACE" \
188190
-DFLB_SQLDB="$FLB_SQLDB" \

0 commit comments

Comments
 (0)