Skip to content

Commit

Permalink
centos7: disable SQL processor to resolve build failures
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick Stephens <[email protected]>
  • Loading branch information
patrick-stephens committed Mar 20, 2024
1 parent 401620b commit 9346a9f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions dockerfiles/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ RUN cmake3 -DCMAKE_INSTALL_PREFIX=/opt/fluent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/e
-DFLB_OUT_KAFKA=On \
-DFLB_JEMALLOC=On \
-DFLB_CHUNK_TRACE=On \
-DFLB_PROCESSOR_SQL=Off \
-DFLB_OUT_PGSQL=On ../

RUN make -j "$(getconf _NPROCESSORS_ONLN)"
15 changes: 15 additions & 0 deletions packaging/distros/centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ RUN yum -y update && \

ARG FLB_OUT_PGSQL=On
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
# Fails on CentOS 7: https://github.com/fluent/fluent-bit/issues/8606
ARG FLB_PROCESSOR_SQL=Off
ENV FLB_PROCESSOR_SQL=$FLB_PROCESSOR_SQL

# centos/7.arm64v8 base image
FROM arm64v8/centos:7 as centos-7.arm64v8-base
Expand All @@ -45,6 +48,9 @@ RUN yum -y update && \
# There are no postgresql libraries available for this target
ARG FLB_OUT_PGSQL=Off
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
# Fails on CentOS 7: https://github.com/fluent/fluent-bit/issues/8606
ARG FLB_PROCESSOR_SQL=Off
ENV FLB_PROCESSOR_SQL=$FLB_PROCESSOR_SQL

# Need larger page size
ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
Expand All @@ -71,6 +77,8 @@ RUN yum -y update && \

ARG FLB_OUT_PGSQL=On
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
ARG FLB_PROCESSOR_SQL=On
ENV FLB_PROCESSOR_SQL=$FLB_PROCESSOR_SQL

# centos/8.arm64v8 base image
FROM arm64v8/centos:8 as centos-8.arm64v8-base
Expand All @@ -95,6 +103,8 @@ RUN yum -y update && \

ARG FLB_OUT_PGSQL=On
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
ARG FLB_PROCESSOR_SQL=On
ENV FLB_PROCESSOR_SQL=$FLB_PROCESSOR_SQL

# Need larger page size
ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
Expand All @@ -114,6 +124,8 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-

ARG FLB_OUT_PGSQL=On
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
ARG FLB_PROCESSOR_SQL=On
ENV FLB_PROCESSOR_SQL=$FLB_PROCESSOR_SQL

# hadolint ignore=DL3029
FROM --platform=arm64 quay.io/centos/centos:stream9 as centos-9.arm64v8-base
Expand All @@ -132,6 +144,8 @@ RUN dnf -y install 'dnf-command(config-manager)' && dnf -y config-manager --set-

ARG FLB_OUT_PGSQL=On
ENV FLB_OUT_PGSQL=$FLB_OUT_PGSQL
ARG FLB_PROCESSOR_SQL=On
ENV FLB_PROCESSOR_SQL=$FLB_PROCESSOR_SQL

# Need larger page size
ARG FLB_JEMALLOC_OPTIONS="--with-lg-page=16 --with-lg-quantum=3"
Expand Down Expand Up @@ -175,6 +189,7 @@ RUN cmake3 -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
-DFLB_JEMALLOC_OPTIONS="$FLB_JEMALLOC_OPTIONS" \
-DFLB_JEMALLOC="${FLB_JEMALLOC}" \
-DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
-DFLB_PROCESSOR_SQL="${FLB_PROCESSOR_SQL}" \
../

VOLUME [ "/output" ]
Expand Down

0 comments on commit 9346a9f

Please sign in to comment.