Skip to content

Commit 9221fd7

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

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

packaging/distros/amazonlinux/Dockerfile

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ 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++ \
23+
gcc10 gcc10-c++ \
2224
wget unzip systemd-devel wget flex bison \
2325
cyrus-sasl-lib cyrus-sasl-devel openssl openssl-libs openssl-devel \
24-
postgresql-devel postgresql-libs \
26+
postgresql-devel postgresql-libs glibc-devel \
2527
libyaml-devel zlib-devel libcurl-devel \
2628
tar gzip && \
2729
yum clean all && \
@@ -55,7 +57,10 @@ RUN yum -y update && \
5557
echo "Downloading CMake ${CMAKE_VERSION}: ${cmake_download_url} -> ${CMAKE_HOME}" && \
5658
curl -jksSL "${cmake_download_url}" | tar -xzf - -C "${CMAKE_HOME}" --strip-components 1
5759

60+
5861
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
62+
ARG FLB_KAFKA=Off
63+
ENV FLB_KAFKA=$FLB_KAFKA
5964

6065
FROM amazonlinux:2023 AS amazonlinux-2023-base
6166

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

8085
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
86+
ARG FLB_KAFKA=On
87+
ENV FLB_KAFKA=$FLB_KAFKA
8188

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

105112
ENV PATH="${CMAKE_HOME}/bin:${PATH}"
113+
ARG FLB_KAFKA=On
114+
ENV FLB_KAFKA=$FLB_KAFKA
115+
106116

107117
# Common build for all distributions now
108118
# hadolint ignore=DL3006
@@ -118,7 +128,7 @@ COPY . ./
118128
WORKDIR /tmp/fluent-bit/build/
119129
# CMake configuration variables
120130
# Unused
121-
ARG CFLAGS
131+
# ARG CFLAGS
122132
ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/
123133
ARG CMAKE_INSTALL_SYSCONFDIR=/etc/
124134
ARG FLB_RELEASE=On
@@ -130,17 +140,22 @@ ARG FLB_OUT_PGSQL=On
130140
ARG FLB_JEMALLOC=On
131141
ARG FLB_CHUNK_TRACE=On
132142

143+
144+
ENV CC=gcc10-gcc
145+
ENV CXX=gcc10-g++
146+
133147
RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
134148
-DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \
135149
-DFLB_RELEASE="$FLB_RELEASE" \
136150
-DFLB_TRACE="$FLB_TRACE" \
137151
-DFLB_SQLDB="$FLB_SQLDB" \
138152
-DFLB_HTTP_SERVER="$FLB_HTTP_SERVER" \
139-
-DFLB_OUT_KAFKA="$FLB_OUT_KAFKA" \
153+
-DFLB_KAFKA="$FLB_KAFKA" \
140154
-DFLB_OUT_PGSQL="$FLB_OUT_PGSQL" \
141155
-DFLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
142156
-DFLB_JEMALLOC="${FLB_JEMALLOC}" \
143157
-DFLB_CHUNK_TRACE="${FLB_CHUNK_TRACE}" \
158+
-DCMAKE_C_FLAGS="${CFLAGS}" \
144159
../
145160

146161
VOLUME [ "/output" ]

0 commit comments

Comments
 (0)