Skip to content

Commit 47ab69b

Browse files
committed
packaging: distros: amazonlinux: disable Kafka on amazonlinux:2
Signed-off-by: Eduardo Silva <[email protected]>
1 parent ca53f8b commit 47ab69b

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

packaging/distros/amazonlinux/Dockerfile

+13-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ ARG CMAKE_URL="https://github.com/Kitware/CMake/releases/download"
1818

1919
# hadolint ignore=DL3033
2020
RUN yum -y update && \
21-
yum install -y rpm-build curl ca-certificates gcc gcc-c++ make bash \
21+
yum install -y rpm-build curl ca-certificates make bash \
22+
gcc gcc-c++ \
2223
wget unzip systemd-devel wget flex bison \
2324
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
24-
postgresql-devel postgresql-libs \
25+
postgresql-devel postgresql-libs glibc-devel \
2526
libyaml-devel zlib-devel libcurl-devel \
2627
tar gzip && \
2728
yum clean all && \
@@ -55,7 +56,10 @@ RUN yum -y update && \
5556
echo "Downloading CMake ${CMAKE_VERSION}: ${cmake_download_url} -> ${CMAKE_HOME}" && \
5657
curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
5758

59+
5860
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
61+
ARG FLB_KAFKA=Off
62+
ENV FLB_KAFKA=$FLB_KAFKA
5963

6064
FROM amazonlinux:2023 AS amazonlinux-2023-base
6165

@@ -78,6 +82,8 @@ RUN yum -y update && \
7882
curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
7983

8084
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
85+
ARG FLB_KAFKA=On
86+
ENV FLB_KAFKA=$FLB_KAFKA
8187

8288
# hadolint ignore=DL3029
8389
FROM --platform=arm64 amazonlinux:2023 AS amazonlinux-2023.arm64v8-base
@@ -103,6 +109,9 @@ RUN yum -y update && \
103109
curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
104110

105111
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
112+
ARG FLB_KAFKA=On
113+
ENV FLB_KAFKA=$FLB_KAFKA
114+
106115

107116
# Common build for all distributions now
108117
# hadolint ignore=DL3006
@@ -118,7 +127,7 @@ COPY . ./
118127
WORKDIR /tmp/fluent-bit/build/
119128
# CMake configuration variables
120129
# Unused
121-
ARG CFLAGS
130+
# ARG CFLAGS
122131
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
123132
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
124133
ARG FLB_RELEASE=On
@@ -136,7 +145,7 @@ RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
136145
-DFLB_TRACE="$FLB_TRACE" \
137146
-DFLB_SQLDB="$FLB_SQLDB" \
138147
-DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
139-
-DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
148+
-DFLB_KAFKA="$FLB_KAFKA" \
140149
-DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
141150
-DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
142151
-DFLB_JEMALLOC="${FLB_JEMALLOC}" \

0 commit comments

Comments
 (0)